@@ -98,6 +100,7 @@ import emojiParser from "@/utils/emojiParser.js";
import statuses from "@/utils/statuses";
const emojiPanel = () => import("@/components/app/EmojiPanels/emojiPanel.vue");
+const EditPanel = () => import("@/components/app/EditPanel.vue");
export default {
components: {
@@ -107,7 +110,8 @@ export default {
uploadsQueue,
emojiSuggestions,
emojiPanel,
- heading
+ heading,
+ EditPanel
},
data() {
return {
@@ -187,9 +191,49 @@ export default {
console.log(error);
}
},
+ async updateMessage() {
+ const editMessage = this.editMessage;
+ this.$refs["input-box"].focus();
+ this.message = this.message.trim();
+ if (this.message === this.editMessage.message){
+ this.$store.dispatch("setEditMessage", null);
+ this.message = "";
+ return;
+ }
+ if (this.message == "") return;
+ if (this.message.length > 5000) return;
+ this.$store.dispatch("setEmojiArray", null);
+ clearInterval(this.postTimerID);
+ this.postTimerID = null;
+ this.messageLength = 0;
+
+ const msg = emojiParser.replaceShortcode(this.message);
+ this.$store.dispatch('updateMessage', {
+ channelID: editMessage.channelID,
+ messageID: editMessage.messageID,
+ message: {message: msg, status: 0}
+ })
+ this.$store.dispatch("setEditMessage", null);
+ this.message = "";
+
+ const {ok, error, result} = await messagesService.update(editMessage.messageID, editMessage.channelID, {
+ message: msg
+ })
+ if (ok) {
+ this.$store.dispatch('updateMessage', {
+ channelID: editMessage.channelID,
+ messageID: editMessage.messageID,
+ message: {status: 1}
+ })
+ } else {
+ this.$store.dispatch('updateMessage', {
+ channelID: editMessage.channelID,
+ messageID: editMessage.messageID,
+ message: {message: msg, status: 2}
+ })
+ }
+ },
async postTimer() {
-
-
this.postTimerID = setTimeout(async () => {
if (this.message.trim() == "") {
clearInterval(this.postTimerID);
@@ -202,7 +246,6 @@ export default {
this.postTimer()
}
}, 2000)
-
},
resize(event) {
@@ -321,9 +364,26 @@ export default {
this.enterEmojiSuggestion();
return;
}
- this.sendMessage();
+ if (this.editMessage) {
+ return this.updateMessage()
+ } else {
+ this.sendMessage();
+ }
}
}
+ if (event.keyCode === 38){ //38 = up arrow
+ if (this.message !== "") return;
+ if (this.editMessage) return;
+ const messagesFiltered = this.selectedChannelMessages.filter(m => m.creator.uniqueID === this.user.uniqueID);
+ if (!messagesFiltered.length) return;
+ event.preventDefault();
+ const lastMessage = messagesFiltered[messagesFiltered.length - 1];
+ this.$store.dispatch("setEditMessage", {
+ messageID: lastMessage.messageID,
+ channelID: lastMessage.channelID
+ });
+
+ }
},
invertScroll(event) {
if (event.deltaY) {
@@ -451,6 +511,15 @@ export default {
window.removeEventListener('focus', this.onFocus)
delete this.$options.sockets.typingStatus;
},
+ watch: {
+ editMessage(editMessage) {
+ if (!editMessage) {
+ this.message = ""
+ } else {
+ this.message = editMessage.message
+ }
+ }
+ },
computed: {
uploadQueue() {
const allUploads = this.$store.getters.getAllUploads;
@@ -507,6 +576,14 @@ export default {
status = presences[channel.recipients[0].uniqueID] || 0;
}
return statuses[status].color;
+ },
+ editMessage() {
+ let editMessage = this.$store.getters.popouts.editMessage;
+ if (!editMessage) return null;
+ editMessage = Object.assign({}, editMessage);
+ const messages = this.$store.getters.messages[editMessage.channelID];
+ editMessage.message = messages.find(m => m.messageID === editMessage.messageID).message
+ return editMessage;
}
}
};
diff --git a/src/components/app/MessageTemplate.vue b/src/components/app/MessageTemplate.vue
index e95fe51..b6b30b0 100644
--- a/src/components/app/MessageTemplate.vue
+++ b/src/components/app/MessageTemplate.vue
@@ -1,5 +1,5 @@
-
-
+
@@ -113,7 +112,8 @@ export default {
},
data() {
return {
- dropDownVisable: false
+ dropDownVisable: false,
+ hover: false
}
},
props: [
@@ -128,7 +128,8 @@ export default {
"type",
"embed",
"messageID",
- "channelID"
+ "channelID",
+ "timeEdited"
],
methods: {
openUserInformation() {
@@ -146,6 +147,10 @@ export default {
this.dropDownVisable = false;
const {ok, error, result} = await messagesService.delete(this.messageID, this.channelID);
+ },
+ editMessage() {
+ this.dropDownVisable = false;
+ this.$store.dispatch("setEditMessage", {channelID: this.channelID, messageID: this.messageID});
}
},
computed: {
@@ -158,7 +163,7 @@ export default {
const filetypes = /jpeg|jpg|gif|png/;
const extname = filetypes.test(path.extname(file.fileName).toLowerCase());
if (!extname) return undefined;
- return config.domain + "/files/" + file.fileID;
+ return config.domain + "/media/" + file.fileID;
},
getFile() {
if (!this.$props.files || this.$props.files.length === 0)
@@ -177,6 +182,9 @@ export default {
getDate() {
return friendlyDate(this.$props.date);
},
+ getEditedDate() {
+ return friendlyDate(this.timeEdited);
+ },
userAvatar() {
return config.domain + "/avatars/" + this.$props.avatar;
},
diff --git a/src/components/app/MyMiniInformation.vue b/src/components/app/MyMiniInformation.vue
index 423119e..144d2ee 100644
--- a/src/components/app/MyMiniInformation.vue
+++ b/src/components/app/MyMiniInformation.vue
@@ -2,10 +2,12 @@
-
hourglass_full
- done
- close Failed
+ edit
+ hourglass_full
+ done
+ close Failed
+
storage
{{ channelData.name }}
@@ -15,7 +15,10 @@ export default {
const notifications = this.$store.getters.notifications;
const find = notifications.find(n => n.channelID === this.channelData.channelID)
return find
- }
+ },
+ selectedChannelID() {
+ return this.$store.getters.selectedChannelID;
+ },
}
};
@@ -62,6 +65,9 @@ export default {
.channel:hover {
background: rgba(139, 139, 139, 0.288);
}
+.selected {
+ background: rgba(139, 139, 139, 0.288);
+}
.channel-name {
overflow: hidden;
text-overflow: ellipsis;
diff --git a/src/components/app/messageEmbedTemplate.vue b/src/components/app/messageEmbedTemplate.vue
index b6c79e4..392444d 100644
--- a/src/components/app/messageEmbedTemplate.vue
+++ b/src/components/app/messageEmbedTemplate.vue
@@ -1,7 +1,7 @@
- ![]()
+ ![]()
@@ -13,7 +13,12 @@
diff --git a/src/components/app/relationships/FriendsTemplate.vue b/src/components/app/relationships/FriendsTemplate.vue
index a06690c..d822122 100644
--- a/src/components/app/relationships/FriendsTemplate.vue
+++ b/src/components/app/relationships/FriendsTemplate.vue
@@ -3,10 +3,12 @@
:class="{friend: true, notifyAnimation: (notifications && notifications > 0) }"
:style="`background: ${status.bgColor};`"
@click="openChat"
+ @mouseover="hover = true"
+ @mouseleave="hover = false"
>
-
- {{ upload.name }}
-
-
- {{ upload.size }}
-
+ {{ upload.name }}
+ {{ upload.size }}
{
- return c !== channelID
- })
+ const filter = context.state.channelsIDs[server_id].filter(c => c !== channelID )
context.commit('SET_CHANNEL_IDs', {serverID: server_id, channelIDs: filter})
- }
+ },
+ removeAllServerChannels(context, server_id) {
+ const serverChannels = context.state.channelsIDs[server_id]
+ context.dispatch('removeChannels', serverChannels, {root: true})
+ context.commit('DELETE_CHANNELS', server_id)
+ },
+ removeNotifications(context, server_id) {
+ const serverChannels = context.state.channelsIDs[server_id]
+ const filteredNotifications = context.rootState.notificationsModule.notifications.filter(n => !serverChannels.includes(n.channelID));
+ context.dispatch('addAllNotifications', filteredNotifications, {root:true});
+
+ },
};
const mutations = {
SET_CHANNEL_IDs(state, {serverID, channelIDs}) {
Vue.set(state.channelsIDs, serverID, channelIDs)
},
+ DELETE_CHANNELS(state, server_id) {
+ Vue.delete(state.channelsIDs, server_id);
+ },
ADD_CHANNELS_IDS(state, {serverID, channelsIDs}) {
const previousChannels = state.channelsIDs[serverID] || []
Vue.set(state.channelsIDs, serverID, [...new Set([...previousChannels, ...channelsIDs])]);
diff --git a/src/store/modules/settingsModule.js b/src/store/modules/settingsModule.js
index fa66610..9c20858 100644
--- a/src/store/modules/settingsModule.js
+++ b/src/store/modules/settingsModule.js
@@ -30,7 +30,6 @@ const actions = {
},
addRecentEmoji(context, shortcode) {
const recentEmojis = JSON.parse(localStorage.getItem('recentEmojis')) || [];
-
let filter = recentEmojis.filter(function (item) {
return item !== shortcode
})
@@ -49,6 +48,15 @@ const actions = {
const emojiID = customEmoji.emoji.emojiID;
const customEmojiList = context.state.customEmojis;
+ // remove from recents
+ const recentEmojis = JSON.parse(localStorage.getItem('recentEmojis')) || [];
+ let filter = recentEmojis.filter(function (item) {
+ return item !== customEmoji.emoji.name
+ })
+ localStorage.setItem("recentEmojis", JSON.stringify(filter));
+ context.commit('setRecentEmojis', filter)
+
+
for (let index = 0; index < customEmojiList.length; index++) {
const element = customEmojiList[index];
if (element.emojiID === emojiID){
diff --git a/src/store/modules/socketIOModule.js b/src/store/modules/socketIOModule.js
index f02eee2..d009fb8 100644
--- a/src/store/modules/socketIOModule.js
+++ b/src/store/modules/socketIOModule.js
@@ -222,6 +222,8 @@ const actions = {
['socket_server:leave'](context, {server_id}) {
context.dispatch('servers/removePresences', server_id);
context.dispatch('servers/removeServer', server_id)
+ context.dispatch('servers/removeNotifications', server_id)
+ context.dispatch('servers/removeAllServerChannels', server_id)
},
['socket_server:memberAdd'](context, {serverMember, presence}) { // member_add
let sm = Object.assign({}, serverMember);
@@ -232,12 +234,9 @@ const actions = {
context.dispatch('members/updatePresence', {uniqueID: member.uniqueID, status: presence})
context.dispatch('members/addMember', member)
context.dispatch('servers/addServerMember', sm)
-
- console.log("someone joined")
},
['socket_server:memberRemove'](context, {uniqueID, server_id}) { // member_remove
context.dispatch('servers/removeServerMember', {uniqueID, server_id})
- console.log("Someone left")
},
['socket_server:members'](context, {serverMembers, memberPresences}) { // members
let serverMembersArr = [];
@@ -266,7 +265,7 @@ const actions = {
},
['socket_server:removeChannel'](context, {server_id, channelID}) {
context.dispatch('servers/removeServerChannel', {server_id, channelID});
-
+ context.dispatch('dismissNotification', channelID);
},
['socket_server:updateServer'](context, data) {
context.dispatch('servers/updateServer', {server_id: data.server_id, server: data});
diff --git a/src/utils/changelog.js b/src/utils/changelog.js
index fbe8d44..a590a12 100644
--- a/src/utils/changelog.js
+++ b/src/utils/changelog.js
@@ -14,10 +14,44 @@
const config = [
+ {
+ version: 5.4,
+ title: "Bug Fixes!",
+ shortTitle: "",
+ date: "24/07/2019",
+ headColor: "rgba(15, 65, 70, 0.77)",
+ fix: [
+ 'Fixed a bug where when pressing the up arrow key to edit while there is text in the text box, it would discard the message and edit.',
+ 'Fixed a bug where when editing a message and going to a different tab, the message is still editing.',
+ 'Fixed a bug where if an emoji is in the recents, and then removed in the settings, the emoji would stay in the recents.',
+ 'Fixed bugs with html escape :scream:',
+ ],
+ },
+ {
+ version: 5.3,
+ title: "Edit messages, More performance!",
+ shortTitle: "",
+ date: "23/07/2019",
+ headColor: "rgba(15, 89, 70, 0.77)",
+ new: [
+ "You can now edit your own messages!",
+ "Avatar and message pictures should now be disk cached.",
+ "Gif avatars will now only animate when being hovered. This will improve performance.",
+ "You can now click on embed images to get a full screen preview.",
+ "Server channels now show a gray background when selected.",
+ ],
+ fix: [
+ 'Fixed a bug where when deleting a server channel, the notification would still stay.',
+ 'Fixed a bug where when sending a message, the friend wouldnt go at the top in the recents list.',
+ ],
+ next: ["HTML channel for servers", "Change username, email and password."],
+ },
+
+
{
version: 5.2,
title: "Delete messages, URL Embeds",
diff --git a/src/utils/messageFormatter.js b/src/utils/messageFormatter.js
index 3566f45..0d9cbe3 100644
--- a/src/utils/messageFormatter.js
+++ b/src/utils/messageFormatter.js
@@ -13,12 +13,12 @@ emojiFormatter.addTransformer({
symbol: ':',
padding: false,
recursive: false,
- validate: text => /.+?&(.+?)/.test(text),
+ validate: text => /.+?&(.+?)/.test(text),
transformer: owo
})
function owo (text) {
- const split = escapeHTML(text).split('&');
+ const split = escapeHTML(text).split('&');
if (!split || split.length <= 1) return `:${text}:`;
const url = split[split.length - 1].slice(4);
return `![:${split[0]}:](${config.domain + )
`
@@ -29,7 +29,7 @@ futoji.addTransformer({
symbol: ':',
padding: false,
recursive: false,
- validate: text => /.+?&(.+?)/.test(text),
+ validate: text => /.+?&(.+?)/.test(text),
transformer: text => {
const formattedInner = emojiFormatter.format(text);
return owo(formattedInner);
@@ -85,7 +85,6 @@ futoji.addTransformer({
symbol: '```',
recursive: false,
transformer: text => {
- //TODO: use https://github.com/atom/highlights instead.
let formatted = formatCode(text)
let highlighted
@@ -109,10 +108,9 @@ futoji.addTransformer({
})
export default (message) => {
- message = futoji.format(message + ' ').trim();
+ message = futoji.format(escapeHtml(message + ' ')).trim();
message = emojiParser.replaceEmojis(message);
-
return message;
}