Unify parameter order for telegram_subscription_* functions

Author: vvd170501

plugins/telegram/mysql_conn.c

@@ -965,7 +965,7 @@ subscription_fetch_func(
         return ts;
     }
 
-    ts = telegram_subscription_create(bot_id, contest_id, user_id);
+    ts = telegram_subscription_create(bot_id, user_id, contest_id);
     mi->unlock(md);
     gc->vt->subscription_save(gc, ts);
     return ts;

plugins/telegram/telegram.c

@@ -1449,7 +1449,7 @@ handle_incoming_message(
                 if (!sub && !strcmp(tcs->command, "/unsubscribe")) {
                     send_result = send_message(state, bs, mc, "You have no subscriptions. Nothing to unsubscribe.", NULL, "{ \"hide_keyboard\": true}");
                 } else {
-                    if (!sub) sub = telegram_subscription_create(bs->bot_id, token->contest_id, token->user_id);
+                    if (!sub) sub = telegram_subscription_create(bs->bot_id, token->user_id, token->contest_id);
                     if (!strcmp(tcs->command, "/subscribe")) {
                         if (tcs->review_flag) sub->review_flag = 1;
                         if (tcs->reply_flag) sub->reply_flag = 1;

plugins/telegram/telegram_subscription.c

@@ -62,7 +62,7 @@ telegram_subscription_free(struct telegram_subscription *sub)
 }
 
 struct telegram_subscription *
-telegram_subscription_create(const unsigned char *bot_id, int contest_id, int user_id)
+telegram_subscription_create(const unsigned char *bot_id, int user_id, int contest_id)
 {
     struct telegram_subscription *sub = NULL;
     unsigned char buf[1024];
@@ -73,8 +73,8 @@ telegram_subscription_create(const unsigned char *bot_id, int contest_id, int us
     XCALLOC(sub, 1);
     sub->_id = xstrdup(buf);
     sub->bot_id = xstrdup(bot_id);
-    sub->contest_id = contest_id;
     sub->user_id = user_id;
+    sub->contest_id = contest_id;
     return sub;
 }
 

plugins/telegram/telegram_subscription.h

@@ -36,6 +36,6 @@ struct telegram_subscription
 struct telegram_subscription *
 telegram_subscription_free(struct telegram_subscription *subscription);
 struct telegram_subscription *
-telegram_subscription_create(const unsigned char *bot_id, int contest_id, int user_id);
+telegram_subscription_create(const unsigned char *bot_id, int user_id, int contest_id);
 
 #endif