undefined room fix
This commit is contained in:
parent
f39699479e
commit
d16d7153e3
935
package-lock.json
generated
935
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
12
package.json
12
package.json
@ -10,6 +10,9 @@
|
||||
"dependencies": {
|
||||
"core-js": "^3.6.5",
|
||||
"matrix-js-sdk": "^9.1.0",
|
||||
"sass": "^1.29.0",
|
||||
"sass-loader": "^10.1.0",
|
||||
"v-emoji-picker": "^2.3.1",
|
||||
"vue": "^2.6.11",
|
||||
"ws": "^7.3.1"
|
||||
},
|
||||
@ -19,8 +22,13 @@
|
||||
"@vue/cli-service": "~4.5.0",
|
||||
"babel-eslint": "^10.1.0",
|
||||
"electron": "^11.0.1",
|
||||
"eslint": "^6.7.2",
|
||||
"eslint-plugin-vue": "^6.2.2",
|
||||
"eslint": "^7.14.0",
|
||||
"eslint-config-airbnb-base": "^14.2.1",
|
||||
"eslint-config-standard": "^16.0.2",
|
||||
"eslint-plugin-import": "^2.22.1",
|
||||
"eslint-plugin-node": "^11.1.0",
|
||||
"eslint-plugin-promise": "^4.2.1",
|
||||
"eslint-plugin-vue": "^7.2.0",
|
||||
"vue-router": "^3.4.9",
|
||||
"vue-template-compiler": "^2.6.11"
|
||||
},
|
||||
|
||||
@ -39,6 +39,12 @@ export default {
|
||||
let msgContainer = document.getElementById("messagesContainer")
|
||||
msgContainer.style.height
|
||||
= `calc(100% - ${id.parentElement.clientHeight}px - 3rem)`
|
||||
},
|
||||
toggleEmojiPicker() {
|
||||
this.showEmojiPicker= !this.showEmojiPicker;
|
||||
},
|
||||
onSelectEmoji(emoji) {
|
||||
this.msg.content.body += emoji.data;
|
||||
}
|
||||
},
|
||||
data(){
|
||||
@ -51,7 +57,8 @@ export default {
|
||||
}
|
||||
},
|
||||
chatroom: main.data().chatroom,
|
||||
session: matrix.data().session
|
||||
session: matrix.data().session,
|
||||
showEmojiPicker: false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
44
src/main.js
44
src/main.js
@ -1,9 +1,9 @@
|
||||
import Vue from 'vue'
|
||||
import VueRouter from 'vue-router'
|
||||
import App from './App.vue'
|
||||
import login from './views/login.vue'
|
||||
import chat from './views/chat.vue'
|
||||
import rooms from './views/rooms.vue'
|
||||
import Vue from "vue"
|
||||
import VueRouter from "vue-router"
|
||||
import App from "./App.vue"
|
||||
import login from "./views/login.vue"
|
||||
import chat from "./views/chat.vue"
|
||||
import rooms from "./views/rooms.vue"
|
||||
|
||||
Vue.config.productionTip = false
|
||||
Vue.use(VueRouter)
|
||||
@ -11,28 +11,28 @@ Vue.use(VueRouter)
|
||||
const router = new VueRouter({
|
||||
routes: [
|
||||
{
|
||||
path: '/',
|
||||
name: 'home',
|
||||
path: "/",
|
||||
name: "home",
|
||||
component: login
|
||||
},
|
||||
{
|
||||
path: '/login',
|
||||
name: 'login',
|
||||
path: "/login",
|
||||
name: "login",
|
||||
component: login
|
||||
},
|
||||
{
|
||||
path: '/chat/*',
|
||||
name: 'chat',
|
||||
path: "/chat/*",
|
||||
name: "chat",
|
||||
component: chat
|
||||
},
|
||||
{
|
||||
path: '/rooms/*',
|
||||
name: 'room',
|
||||
path: "/rooms/*",
|
||||
name: "room",
|
||||
component: rooms
|
||||
},
|
||||
{
|
||||
path: '/rooms',
|
||||
name: 'rooms',
|
||||
path: "/rooms",
|
||||
name: "rooms",
|
||||
component: rooms
|
||||
}
|
||||
]
|
||||
@ -43,7 +43,7 @@ let chatroom = {
|
||||
user: [],
|
||||
username: "you",
|
||||
messages: []
|
||||
};
|
||||
}
|
||||
|
||||
export default {
|
||||
data(){
|
||||
@ -60,21 +60,21 @@ export default {
|
||||
}
|
||||
|
||||
new Vue({
|
||||
el: '#app',
|
||||
el: "#app",
|
||||
router,
|
||||
template: '<App/>',
|
||||
template: "<App/>",
|
||||
components: {App},
|
||||
data(){
|
||||
return {
|
||||
chatroom: chatroom
|
||||
}
|
||||
}
|
||||
}).$mount('#app')
|
||||
}).$mount("#app")
|
||||
|
||||
function element(id){ return document.getElementById(id)}
|
||||
function show_error(msg) {
|
||||
let error_style = element('errorBox').style
|
||||
element('errorMessage').innerText = msg
|
||||
let error_style = element("errorBox").style
|
||||
element("errorMessage").innerText = msg
|
||||
error_style.display = "block"
|
||||
error_style.animation = "slide-from-left alternate 0.2s"
|
||||
setTimeout(() => {error_style.animation = ""}, 200)
|
||||
|
||||
189
src/matrix.js
189
src/matrix.js
@ -2,158 +2,169 @@ import matrix from 'matrix-js-sdk';
|
||||
import main from '@/main.js';
|
||||
// import Vue from 'vue';
|
||||
|
||||
var matrix_cli = matrix.createClient({
|
||||
baseUrl: "https://adb.sh",
|
||||
accessToken: getCookie("accessToken"),
|
||||
userId: getCookie("userId")
|
||||
})
|
||||
const client = matrix.createClient({
|
||||
baseUrl: 'https://adb.sh',
|
||||
accessToken: getCookie('accessToken'),
|
||||
userId: getCookie('userId'),
|
||||
});
|
||||
let session = {
|
||||
user: "",
|
||||
password: "",
|
||||
accessToken: "",
|
||||
user: '',
|
||||
password: '',
|
||||
accessToken: '',
|
||||
rooms: [],
|
||||
currentRoom: undefined,
|
||||
login: {
|
||||
user: "",
|
||||
password: ""
|
||||
}
|
||||
user: '',
|
||||
password: '',
|
||||
},
|
||||
};
|
||||
|
||||
console.log(document.cookie)
|
||||
console.log(document.cookie);
|
||||
|
||||
if (getCookie("accessToken") && getCookie("userId")){
|
||||
if (getCookie('accessToken') && getCookie('userId')) {
|
||||
document.cookie = `expires=${new Date(Date.now() + 86400 * 10 * 1000)}`;
|
||||
session = {
|
||||
user: getCookie("userId"),
|
||||
password: "",
|
||||
accessToken: getCookie("accessToken"),
|
||||
user: getCookie('userId'),
|
||||
password: '',
|
||||
accessToken: getCookie('accessToken'),
|
||||
rooms: [],
|
||||
currentRoom: undefined
|
||||
currentRoom: undefined,
|
||||
};
|
||||
// Vue.$router.push("/rooms/")
|
||||
window.location.href = '/#/rooms/';
|
||||
matrix_cli.startClient();
|
||||
matrix_cli.once('sync', function (state){
|
||||
console.log(state)
|
||||
})
|
||||
}
|
||||
else window.location.href = '/#/login';
|
||||
client.startClient();
|
||||
client.once('sync', (state) => {
|
||||
console.log(state);
|
||||
});
|
||||
} else window.location.href = '/#/login';
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
session: session
|
||||
}
|
||||
session,
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
login() {
|
||||
if (session.accessToken !== ""){
|
||||
main.methods.error("you are already logged in")
|
||||
if (session.accessToken !== '') {
|
||||
main.methods.error('you are already logged in');
|
||||
return;
|
||||
} else if (session.login.user === ""){
|
||||
main.methods.error('username is empty')
|
||||
} if (session.login.user === '') {
|
||||
main.methods.error('username is empty');
|
||||
return;
|
||||
} else if (session.login.password === ""){
|
||||
main.methods.error('password is empty')
|
||||
} if (session.login.password === '') {
|
||||
main.methods.error('password is empty');
|
||||
return;
|
||||
} else if (!(session.login.user.includes("@") && session.login.user.includes(":"))){
|
||||
main.methods.error('username is in wrong style')
|
||||
} if (!(session.login.user.includes('@') && session.login.user.includes(':'))) {
|
||||
main.methods.error('username is in wrong style');
|
||||
return;
|
||||
}
|
||||
matrix_cli.login("m.login.password", {
|
||||
client.login('m.login.password', {
|
||||
user: session.login.user,
|
||||
password: session.login.password,
|
||||
initial_device_display_name: "matrix chat",
|
||||
initial_device_display_name: 'matrix chat',
|
||||
}).then((response) => {
|
||||
document.cookie = `accessToken=${response.access_token}`;
|
||||
document.cookie = `userId=${session.login.user}`;
|
||||
document.cookie = `max-expires=${new Date(Date.now() + 86400 * 10 * 1000)}`;
|
||||
session = {
|
||||
user: session.login.user,
|
||||
password: "",
|
||||
password: '',
|
||||
accessToken: response.access_token,
|
||||
rooms: [],
|
||||
currentRoom: undefined
|
||||
currentRoom: undefined,
|
||||
};
|
||||
console.log(`access token => ${response.access_token}`);
|
||||
if (response.error) {
|
||||
main.methods.error(response.error)
|
||||
console.log(`login error => ${response.error}`)
|
||||
main.methods.error(response.error);
|
||||
console.log(`login error => ${response.error}`);
|
||||
}
|
||||
window.location.href = '/#/rooms/';
|
||||
matrix_cli.startClient();
|
||||
matrix_cli.once('sync', function (state){
|
||||
console.log(state)
|
||||
})
|
||||
client.startClient();
|
||||
client.once('sync', (state) => {
|
||||
console.log(state);
|
||||
});
|
||||
});
|
||||
},
|
||||
sendMessage(msg) {
|
||||
let msgSend = {
|
||||
const msgSend = {
|
||||
type: msg.type,
|
||||
content: {
|
||||
body: msg.content.body,
|
||||
msgtype: msg.content.msgtype
|
||||
}
|
||||
}
|
||||
matrix_cli.sendEvent(session.currentRoom.roomId, msgSend.type, msgSend.content, "").then(()=>{
|
||||
console.log("message sent successfully")
|
||||
}).catch(err => {
|
||||
console.log(`error while sending message => ${err}`)
|
||||
main.methods.error("message could not be sent")
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
msgtype: msg.content.msgtype,
|
||||
},
|
||||
};
|
||||
client.sendEvent(session.currentRoom.roomId, msgSend.type, msgSend.content, '').then(() => {
|
||||
console.log('message sent successfully');
|
||||
}).catch((err) => {
|
||||
console.log(`error while sending message => ${err}`);
|
||||
main.methods.error('message could not be sent');
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
function getCookie(key) {
|
||||
let cookie = document.cookie.replace(/ /g, '').split(';')
|
||||
.find(cookie => cookie.split('=')[0] === key);
|
||||
const cookie = document.cookie.replace(/ /g, '').split(';')
|
||||
.find((cookie) => cookie.split('=')[0] === key);
|
||||
return cookie ? cookie.split('=')[1] : false;
|
||||
}
|
||||
|
||||
matrix_cli.on("event", event => {
|
||||
client.on('event', (event) => {
|
||||
console.log(event.getType());
|
||||
console.log(event);
|
||||
if (event.getType() === "m.room.name") {
|
||||
matrix_cli.getRooms().forEach(newRoom => {
|
||||
let room = session.rooms.find(room => room.roomId === newRoom.roomId)
|
||||
if (event.getType() === 'm.room.name') {
|
||||
client.getRooms().forEach((newRoom) => {
|
||||
const room = session.rooms.find((room) => room.roomId === newRoom.roomId);
|
||||
if (!room) {
|
||||
session.rooms.push({name: newRoom.name, roomId: newRoom.roomId, messages: [], members: []})
|
||||
console.log(`new room => ${newRoom.name}`)
|
||||
session.rooms.push({
|
||||
name: newRoom.name, roomId: newRoom.roomId, messages: [], members: [],
|
||||
});
|
||||
console.log(`new room => ${newRoom.name}`);
|
||||
} else if (room.name !== newRoom.name) {
|
||||
console.log(`roomname changed from ${room.name} to ${newRoom.name}`)
|
||||
room.name = newRoom.name
|
||||
console.log(`roomname changed from ${room.name} to ${newRoom.name}`);
|
||||
room.name = newRoom.name;
|
||||
}
|
||||
})
|
||||
}
|
||||
else if (event.getType() === "m.room.member"){
|
||||
let room = session.rooms.find(room => room.roomId === event.event.room_id)
|
||||
});
|
||||
} else if (event.getType() === 'm.room.member') {
|
||||
const room = session.rooms.find((room) => room.roomId === event.event.room_id);
|
||||
if (!room) {
|
||||
session.rooms.push({name: "undefined", roomId: event.event.room_id, messages: [], members: []})
|
||||
console.log(`new user => ${event.event.sender}`)
|
||||
session.rooms.push({
|
||||
name: 'undefined', roomId: event.event.room_id, messages: [], members: [],
|
||||
});
|
||||
console.log(`new user => ${event.event.sender}`);
|
||||
} else {
|
||||
room.members.push({sender: event.event.sender, content: event.event.content})
|
||||
room.members.push({ sender: event.event.sender, content: event.event.content });
|
||||
}
|
||||
}
|
||||
console.log(session)
|
||||
})
|
||||
console.log(session);
|
||||
});
|
||||
|
||||
matrix_cli.on("Room.timeline", event => {
|
||||
if (event.getType() === "m.room.message") {
|
||||
console.log(`new message => ${event.event.content.body}`);
|
||||
let room = session.rooms.find(room => room.roomId === event.event.room_id)
|
||||
if (!room) {
|
||||
session.rooms.push({name: "undefined", roomId: event.event.room_id, messages: [event.event], members: []})
|
||||
console.log(`undefined room name for => ${event.event.room_id}`)
|
||||
} else room.messages.push(event.event)
|
||||
client.on('Room.timeline', (event, room) => {
|
||||
if (event.getType() === 'm.room.message') {
|
||||
console.log(`message => ${event.event.content.body}`);
|
||||
const thisRoom = session.rooms.find((thisRoom) => thisRoom.roomId === room.roomId);
|
||||
if (!thisRoom) {
|
||||
session.rooms.push({
|
||||
name: room.name, roomId: event.event.room_id, messages: [event.event], members: [],
|
||||
});
|
||||
} else {
|
||||
thisRoom.messages.push(event.event);
|
||||
if (thisRoom.name === 'undefined') thisRoom.name = room.name;
|
||||
}
|
||||
|
||||
let msgContainer = document.getElementById("messagesContainer")
|
||||
if (session.currentRoom && session.currentRoom.roomId === event.event.room_id) {
|
||||
if (event.event.sender === session.user || msgContainer.scrollHeight < msgContainer.scrollTop + 1000)
|
||||
const msgContainer = document.getElementById('messagesContainer');
|
||||
if (session.currentRoom && session.currentRoom.roomId === room.roomId) {
|
||||
if (event.event.sender === session.user || msgContainer.scrollHeight < msgContainer.scrollTop + 1000) {
|
||||
setTimeout(() => {
|
||||
msgContainer.scrollTo(0, msgContainer.scrollHeight)
|
||||
}, 10)
|
||||
else document.getElementById("scrollDown").style.display = "block"
|
||||
msgContainer.scrollTo(0, msgContainer.scrollHeight);
|
||||
}, 10);
|
||||
} else document.getElementById('scrollDown').style.display = 'block';
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
client.on('Room.member', (member) => {
|
||||
console.log('this is a member');
|
||||
console.log(member);
|
||||
});
|
||||
|
||||
@ -44,7 +44,7 @@ export default {
|
||||
},
|
||||
getTime(time){
|
||||
let date = new Date(time);
|
||||
return `${date.getHours()}:${(date.getMinutes()<10)?"0"+date.getMinutes():date.getMinutes()}`;
|
||||
return `${date.getHours()}:${(date.getMinutes()<10)?"0":""}${date.getMinutes()}`;
|
||||
},
|
||||
getDate(time){
|
||||
let months = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user