Merge pull request #959 from neuroscr/opengroupordering

open group avatar redo conversion properly
pull/991/head
Ryan Tharp 6 years ago committed by GitHub
commit bb7d4820a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -709,12 +709,10 @@
} }
// lets not allow ANY URLs, lets force it to be local to public chat server // lets not allow ANY URLs, lets force it to be local to public chat server
const relativeFileUrl = fileObj.url.replace( const url = new URL(fileObj.url);
API.serverAPI.baseServerUrl,
''
);
// write it to the channel // write it to the channel
await API.setChannelAvatar(relativeFileUrl); await API.setChannelAvatar(url.pathname);
} }
if (await API.setChannelName(groupName)) { if (await API.setChannelName(groupName)) {
@ -1992,7 +1990,7 @@
const isDuplicate = await isMessageDuplicate(message); const isDuplicate = await isMessageDuplicate(message);
if (isDuplicate) { if (isDuplicate) {
// RSS expects duplciates, so squelch log // RSS expects duplicates, so squelch log
if (!descriptorId.match(/^rss:/)) { if (!descriptorId.match(/^rss:/)) {
window.log.warn('Received duplicate message', message.idForLogging()); window.log.warn('Received duplicate message', message.idForLogging());
} }

Loading…
Cancel
Save