diff options
Diffstat (limited to 'protocols/twitter')
| -rw-r--r-- | protocols/twitter/twitter.c | 27 | ||||
| -rw-r--r-- | protocols/twitter/twitter_lib.h | 1 |
2 files changed, 6 insertions, 22 deletions
diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c index b0ab98c4..d43d2909 100644 --- a/protocols/twitter/twitter.c +++ b/protocols/twitter/twitter.c @@ -368,25 +368,11 @@ static const struct oauth_service twitter_oauth = { .consumer_secret = "FCxqcr0pXKzsF9ajmP57S3VQ8V6Drk4o2QYtqMcOszo", }; -static const struct oauth_service identica_oauth = { - "https://identi.ca/api/oauth/request_token", - "https://identi.ca/api/oauth/access_token", - "https://identi.ca/api/oauth/authorize", - .consumer_key = "e147ff789fcbd8a5a07963afbb43f9da", - .consumer_secret = "c596267f277457ec0ce1ab7bb788d828", -}; - static gboolean twitter_oauth_callback(struct oauth_info *info); static const struct oauth_service *get_oauth_service(struct im_connection *ic) { - struct twitter_data *td = ic->proto_data; - - if (strstr(td->url_host, "identi.ca")) { - return &identica_oauth; - } else { - return &twitter_oauth; - } + return &twitter_oauth; /* Could add more services, or allow configuring your own base URL + API keys. */ @@ -399,9 +385,8 @@ static void twitter_oauth_start(struct im_connection *ic) imcb_log(ic, "Requesting OAuth request token"); - if (!strstr(url, "twitter.com") && !strstr(url, "identi.ca")) { - imcb_log(ic, "Warning: OAuth only works with identi.ca and " - "Twitter."); + if (!strstr(url, "twitter.com")) { + imcb_log(ic, "Warning: OAuth only works with Twitter."); } td->oauth_info = oauth_request_token(get_oauth_service(ic), twitter_oauth_callback, ic); @@ -574,8 +559,8 @@ static void twitter_init(account_t * acc) def_url = TWITTER_API_URL; def_tul = "23"; def_mentions = "true"; - } else { /* if( strcmp( acc->prpl->name, "identica" ) == 0 ) */ - def_url = IDENTICA_API_URL; + } else { + def_url = ""; def_tul = "0"; def_mentions = "false"; } @@ -592,7 +577,7 @@ static void twitter_init(account_t * acc) s = set_add(&acc->set, "fetch_mentions", def_mentions, set_eval_bool, acc); - s = set_add(&acc->set, "message_length", "140", set_eval_int, acc); + s = set_add(&acc->set, "message_length", "280", set_eval_int, acc); s = set_add(&acc->set, "target_url_length", def_tul, set_eval_int, acc); diff --git a/protocols/twitter/twitter_lib.h b/protocols/twitter/twitter_lib.h index 88396a1e..03da6421 100644 --- a/protocols/twitter/twitter_lib.h +++ b/protocols/twitter/twitter_lib.h @@ -29,7 +29,6 @@ #include "twitter_http.h" #define TWITTER_API_URL "https://api.twitter.com/1.1" -#define IDENTICA_API_URL "https://identi.ca/api" /* Status URLs */ #define TWITTER_STATUS_UPDATE_URL "/statuses/update.json" |