diff options
| -rw-r--r-- | data.c | 6 | ||||
| -rw-r--r-- | html.c | 5 | ||||
| -rw-r--r-- | snac.h | 2 |
3 files changed, 7 insertions, 6 deletions
| @@ -1959,19 +1959,19 @@ xs_list *muted_list(snac *user) | |||
| 1959 | 1959 | ||
| 1960 | /** emojis react **/ | 1960 | /** emojis react **/ |
| 1961 | 1961 | ||
| 1962 | const xs_str *emoji_reacted(snac *user, const char *id) | 1962 | xs_str *emoji_reacted(snac *user, const char *id) |
| 1963 | /* returns the emoji an user reacted to a message */ | 1963 | /* returns the emoji an user reacted to a message */ |
| 1964 | { | 1964 | { |
| 1965 | xs *emojis = object_get_emoji_reacts(id); | 1965 | xs *emojis = object_get_emoji_reacts(id); |
| 1966 | int c = 0; | 1966 | int c = 0; |
| 1967 | const char *v; | 1967 | const char *v; |
| 1968 | xs_dict *msg; | ||
| 1969 | 1968 | ||
| 1970 | while (xs_list_next(emojis, &v, &c)) { | 1969 | while (xs_list_next(emojis, &v, &c)) { |
| 1970 | xs *msg = NULL; | ||
| 1971 | if (object_get_by_md5(v, &msg)) { | 1971 | if (object_get_by_md5(v, &msg)) { |
| 1972 | const xs_val *act = xs_dict_get(msg, "actor"); | 1972 | const xs_val *act = xs_dict_get(msg, "actor"); |
| 1973 | if (act && strcmp(act, user->actor) == 0) | 1973 | if (act && strcmp(act, user->actor) == 0) |
| 1974 | return xs_dict_get(msg, "content"); | 1974 | return xs_dup(xs_dict_get(msg, "content")); |
| 1975 | } | 1975 | } |
| 1976 | } | 1976 | } |
| 1977 | return NULL; | 1977 | return NULL; |
| @@ -2107,14 +2107,15 @@ xs_html *html_entry_controls(snac *user, const char *actor, | |||
| 2107 | /* the post textarea */ | 2107 | /* the post textarea */ |
| 2108 | xs *div_id = xs_fmt("%s_reply", md5); | 2108 | xs *div_id = xs_fmt("%s_reply", md5); |
| 2109 | xs *form_id = xs_fmt("%s_reply_form", md5); | 2109 | xs *form_id = xs_fmt("%s_reply_form", md5); |
| 2110 | xs *e_react = emoji_reacted(user, id); | ||
| 2110 | 2111 | ||
| 2111 | xs_html_add(controls, xs_html_tag("div", | 2112 | xs_html_add(controls, xs_html_tag("div", |
| 2112 | xs_html_tag("p", NULL), | 2113 | xs_html_tag("p", NULL), |
| 2113 | html_emoji( | 2114 | html_emoji( |
| 2114 | user, L("Emoji react"), | 2115 | user, L("Emoji react..."), |
| 2115 | div_id, form_id, | 2116 | div_id, form_id, |
| 2116 | ":neocat:", id, | 2117 | ":neocat:", id, |
| 2117 | emoji_reacted(user, id))), | 2118 | e_react)), |
| 2118 | xs_html_tag("p", NULL)); | 2119 | xs_html_tag("p", NULL)); |
| 2119 | } | 2120 | } |
| 2120 | 2121 | ||
| @@ -205,7 +205,7 @@ void unmute(snac *snac, const char *actor); | |||
| 205 | int is_muted(snac *snac, const char *actor); | 205 | int is_muted(snac *snac, const char *actor); |
| 206 | xs_list *muted_list(snac *user); | 206 | xs_list *muted_list(snac *user); |
| 207 | 207 | ||
| 208 | const xs_str *emoji_reacted(snac *user, const char *id); | 208 | xs_str *emoji_reacted(snac *user, const char *id); |
| 209 | 209 | ||
| 210 | int is_bookmarked(snac *user, const char *id); | 210 | int is_bookmarked(snac *user, const char *id); |
| 211 | int bookmark(snac *user, const char *id); | 211 | int bookmark(snac *user, const char *id); |