devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Fix lastactivity behaviour

Browse Source 
Autocomplete only completed on|off.

Now:

`/lastactivity get` -> get server uptime
`/lastactivity get <jid>` -> get user lastactivity
`/lastactivity set on` -> enable for self
`/lastactivity set off` -> disable for self

Fix https://github.com/profanity-im/profanity/issues/1411
This commit is contained in:
Michael Vetter
2020-07-22 13:13:30 +02:00
parent 7319f9eb1d
commit a5ca65453e
3 changed files with 68 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/command/cmd_funcs.c
View File

@@ -4903,15 +4903,20 @@ cmd_sendfile(ProfWin* window, const char* const command, gchar** args)
gboolean
cmd_lastactivity(ProfWin* window, const char* const command, gchar** args)
{
if ((g_strcmp0(args[0], "on") == 0) || (g_strcmp0(args[0], "off") == 0)) {
_cmd_set_boolean_preference(args[0], command, "Last activity", PREF_LASTACTIVITY);
if (g_strcmp0(args[0], "on") == 0) {
caps_add_feature(XMPP_FEATURE_LASTACTIVITY);
if ((g_strcmp0(args[0], "set") == 0)) {
if ((g_strcmp0(args[1], "on") == 0) || (g_strcmp0(args[1], "off") == 0)) {
_cmd_set_boolean_preference(args[1], command, "Last activity", PREF_LASTACTIVITY);
if (g_strcmp0(args[1], "on") == 0) {
caps_add_feature(XMPP_FEATURE_LASTACTIVITY);
}
if (g_strcmp0(args[1], "off") == 0) {
caps_remove_feature(XMPP_FEATURE_LASTACTIVITY);
}
return TRUE;
} else {
cons_bad_cmd_usage(command);
return TRUE;
}
if (g_strcmp0(args[0], "off") == 0) {
caps_remove_feature(XMPP_FEATURE_LASTACTIVITY);
}
return TRUE;
}
jabber_conn_status_t conn_status = connection_get_status();
@@ -4921,20 +4926,25 @@ cmd_lastactivity(ProfWin* window, const char* const command, gchar** args)
return TRUE;
}
if (args[0] == NULL) {
Jid* jidp = jid_create(connection_get_fulljid());
GString* jid = g_string_new(jidp->domainpart);
if ((g_strcmp0(args[0], "get") == 0)) {
if (args[1] == NULL) {
Jid* jidp = jid_create(connection_get_fulljid());
GString* jid = g_string_new(jidp->domainpart);
iq_last_activity_request(jid->str);
iq_last_activity_request(jid->str);
g_string_free(jid, TRUE);
jid_destroy(jidp);
g_string_free(jid, TRUE);
jid_destroy(jidp);
return TRUE;
} else {
iq_last_activity_request(args[0]);
return TRUE;
return TRUE;
} else {
iq_last_activity_request(args[1]);
return TRUE;
}
}
cons_bad_cmd_usage(command);
return TRUE;
}
gboolean