chipmunkmc/gamja
1
0
Fork 0
mirror of https://codeberg.org/emersion/gamja.git synced 2024-11-14 19:05:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move createBuffer to State

Browse source
This commit is contained in:
Simon Ser 2021-06-04 18:37:34 +02:00
parent 2c1bb4ce6a
commit 2af58f8d0b
2 changed files with 60 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
components/app.js
View file

@ -111,25 +111,6 @@ function debounce(f, delay) {
};
}
function isServerBuffer(buf) {
return buf.type == BufferType.SERVER;
}
/* Returns 1 if a should appear after b, -1 if a should appear before b, or
* 0 otherwise. */
function compareBuffers(a, b) {
if (a.server != b.server) {
return a.server > b.server ? 1 : -1;
}
if (isServerBuffer(a) != isServerBuffer(b)) {
return isServerBuffer(b) ? 1 : -1;
}
if (a.name != b.name) {
return a.name > b.name ? 1 : -1;
}
return 0;
}
export default class App extends Component {
state = {
connectParams: {
@ -269,42 +250,10 @@ export default class App extends Component {
createBuffer(serverID, name, callback) {
var id = null;
this.setState((state) => {
if (State.getBuffer(state, { server: serverID, name })) {
return;
}
this.lastBufferID++;
id = this.lastBufferID;
var type;
if (name == SERVER_BUFFER) {
type = BufferType.SERVER;
} else if (this.isChannel(name)) {
type = BufferType.CHANNEL;
} else {
type = BufferType.NICK;
}
var client = this.clients.get(serverID);
var cm = client ? client.cm : irc.CaseMapping.RFC1459;
var bufferList = Array.from(state.buffers.values());
bufferList.push({
id,
name,
type,
server: serverID,
serverInfo: null, // if server
topic: null, // if channel
members: new irc.CaseMapMap(null, cm), // if channel
who: null, // if nick
offline: false, // if nick
messages: [],
unread: Unread.NONE,
});
bufferList = bufferList.sort(compareBuffers);
var buffers = new Map(bufferList.map((buf) => [buf.id, buf]));
return { buffers };
var updated;
[id, updated] = State.createBuffer(state, name, serverID, client);
return updated;
}, () => {
if (callback) {
callback(id);

57
state.js
View file

@ -92,6 +92,27 @@ function updateState(state, updater) {
return { ...state, ...updated };
}
function isServerBuffer(buf) {
return buf.type == BufferType.SERVER;
}
/* Returns 1 if a should appear after b, -1 if a should appear before b, or
* 0 otherwise. */
function compareBuffers(a, b) {
if (a.server != b.server) {
return a.server > b.server ? 1 : -1;
}
if (isServerBuffer(a) != isServerBuffer(b)) {
return isServerBuffer(b) ? 1 : -1;
}
if (a.name != b.name) {
return a.name > b.name ? 1 : -1;
}
return 0;
}
var lastBufferID = 0;
export const State = {
updateServer(state, id, updater) {
var server = state.servers.get(id);
@ -161,6 +182,42 @@ export const State = {
throw new Error("Invalid buffer ID type: " + (typeof id));
}
},
createBuffer(state, name, serverID, client) {
var buf = State.getBuffer(state, { server: serverID, name });
if (buf) {
return [buf.id, null];
}
lastBufferID++;
var id = lastBufferID;
var type;
if (name == SERVER_BUFFER) {
type = BufferType.SERVER;
} else if (client.isChannel(name)) {
type = BufferType.CHANNEL;
} else {
type = BufferType.NICK;
}
var bufferList = Array.from(state.buffers.values());
bufferList.push({
id,
name,
type,
server: serverID,
serverInfo: null, // if server
topic: null, // if channel
members: new irc.CaseMapMap(null, client.cm), // if channel
who: null, // if nick
offline: false, // if nick
messages: [],
unread: Unread.NONE,
});
bufferList = bufferList.sort(compareBuffers);
var buffers = new Map(bufferList.map((buf) => [buf.id, buf]));
return [id, { buffers }];
},
handleMessage(state, msg, serverID, client) {
function updateServer(updater) {
return State.updateServer(state, serverID, updater);