From 3f58aba2bd373b011f104c499ff42f1bf4b45226 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Wed, 18 Dec 2019 13:29:28 +0100 Subject: xep-0084: save avatars in own directory --- src/xmpp/avatar.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'src/xmpp') diff --git a/src/xmpp/avatar.c b/src/xmpp/avatar.c index 9d8013f7..79aebe49 100644 --- a/src/xmpp/avatar.c +++ b/src/xmpp/avatar.c @@ -35,6 +35,8 @@ #include #include +#include +#include #include "log.h" #include "xmpp/connection.h" @@ -63,6 +65,7 @@ avatar_pep_subscribe(void) bool avatar_get_by_nick(const char* nick) { + free(looking_for); looking_for = strdup(nick); caps_add_feature(XMPP_FEATURE_USER_AVATAR_METADATA_NOTIFY); return TRUE; @@ -123,14 +126,12 @@ avatar_request_item_by_id(const char *jid, const char *id) caps_remove_feature(XMPP_FEATURE_USER_AVATAR_METADATA_NOTIFY); xmpp_ctx_t * const ctx = connection_get_ctx(); - //char *id = connection_create_stanza_id(); xmpp_stanza_t *iq = stanza_create_avatar_retrieve_data_request(ctx, id, jid); iq_id_handler_add("retrieve1", avatar_request_item_handler, free, NULL); iq_send_stanza(iq); - //free(id); xmpp_stanza_release(iq); } @@ -173,13 +174,28 @@ avatar_request_item_handler(xmpp_stanza_t *const stanza, void *const userdata) gsize size; gchar *de = (gchar*)g_base64_decode(buf, &size); free(buf); - GError *err = NULL; + char *path = files_get_data_path(""); GString *filename = g_string_new(path); + free(path); + + g_string_append(filename, "avatars/"); + + errno = 0; + int res = g_mkdir_with_parents(filename->str, S_IRWXU); + if (res == -1) { + char *errmsg = strerror(errno); + if (errmsg) { + log_error("Avatar: error creating directory: %s, %s", filename->str, errmsg); + } else { + log_error("Avatar: creating directory: %s", filename->str); + } + } + g_string_append(filename, from_attr); g_string_append(filename, ".png"); - free(path); + GError *err = NULL; if (g_file_set_contents (filename->str, de, size, &err) == FALSE) { log_error("Unable to save picture: %s", err->message); cons_show("Unable to save picture %s", err->message); -- cgit 1.4.1-2-gfad0 '/danisanti/profani-tty/tree/?id=4fc938d80425f647a7db34ff2f23b05780552d49'>root/src/command/cmd_funcs.h
blob: 4b7b60171034d7f3bdb56d877bee7f7fe6b71d03 (plain) (blame) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234