goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use full persona b64 when rendering in chat

dbus-notify
Zlatin Balevsky 2022-07-27 23:01:23 +01:00
parent fcafa7e9d4
commit 4e22d10d7c
No known key found for this signature in database
GPG Key ID: A72832072D525E41
5 changed files with 46 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/com/muwire/core/util/DataUtil.java
View File

@ -34,6 +34,16 @@ public class DataUtil {
return false;
}
private static final Set<Character> BASE64_CHARS = new HashSet<>();
static {
for (int i = 0; i < Base64.ALPHABET_I2P.length(); i++)
BASE64_CHARS.add(Base64.ALPHABET_I2P.charAt(i));
}
public static boolean validBase64(char c) {
return BASE64_CHARS.contains(c);
}
private final static int MAX_SHORT = (0x1 << 16) - 1;
static void writeUnsignedShort(int value, OutputStream os) throws IOException {

8
gui/griffon-app/models/com/muwire/gui/ChatRoomModel.groovy
View File

@ -45,6 +45,14 @@ class ChatRoomModel {
null
}
PersonaOrProfile getByPersona(Persona persona) {
for(PersonaOrProfile pop : members) {
if (persona == pop.getPersona())
return pop
}
null
}
class ChatPOP implements PersonaOrProfile {
final Persona persona
Icon icon

4
gui/griffon-app/views/com/muwire/gui/ChatRoomView.groovy
View File

@ -247,12 +247,12 @@ class ChatRoomView {
if (settings.chatNotifyMentions &&
sender.getPersona() != model.core.me &&
text.contains("@${model.core.me.getHumanReadableName()}"))
text.contains("@${model.core.me.toBase64()}@"))
chatNotificator.notifyMention()
StyledDocument doc = roomTextArea.getStyledDocument()
def textField = new ChatEntry(text, settings, model::getByName, timestamp, sender)
def textField = new ChatEntry(text, settings, model::getByPersona, timestamp, sender)
def style = doc.addStyle("newStyle", null)
StyleConstants.setComponent(style, textField)
doc.insertString(doc.getEndPosition().getOffset() - 1, " ", style)

72
gui/src/main/groovy/com/muwire/gui/chat/ChatEntry.groovy
View File

@ -1,11 +1,13 @@
package com.muwire.gui.chat
import com.muwire.core.Constants
import com.muwire.core.Persona
import com.muwire.core.util.DataUtil
import com.muwire.gui.UISettings
import com.muwire.gui.contacts.POPLabel
import com.muwire.gui.profile.PersonaOrProfile
import com.muwire.gui.profile.ProfileConstants
import net.i2p.data.Base64
import javax.swing.BorderFactory
import javax.swing.JLabel
@ -24,15 +26,14 @@ class ChatEntry extends JTextPane {
private static final SimpleDateFormat SDF = new SimpleDateFormat("dd/MM hh:mm:ss")
private static final char AT = "@".toCharacter()
private static final char EQUALS = "=".toCharacter()
private final UISettings settings
private final Function<String, PersonaOrProfile> function
private final Function<Persona, PersonaOrProfile> function
private final List<ChatToken> tokens = []
private String currentName
ChatEntry(String text, UISettings settings, Function<String, PersonaOrProfile> function,
ChatEntry(String text, UISettings settings, Function<Persona, PersonaOrProfile> function,
long timestamp, PersonaOrProfile sender) {
super()
this.settings = settings
@ -67,21 +68,11 @@ class ChatEntry extends JTextPane {
private abstract class ParsingState {
protected final StringBuilder stringBuilder = new StringBuilder()
protected final int maxSize
protected boolean consumed
ParsingState(int maxSize) {
this.maxSize = maxSize
}
ParsingState process(char c) {
stringBuilder.append(c)
if (stringBuilder.size() > maxSize) {
consumed = true
tokens << new TextChatToken(stringBuilder.toString())
return new TextParsingState()
}
return consume(c)
}
@ -96,57 +87,42 @@ class ChatEntry extends JTextPane {
}
private class TextParsingState extends ParsingState {
TextParsingState() {
super(Integer.MAX_VALUE)
}
@Override
ParsingState consume(char c) {
if (c == AT) {
consumed = true
tokens << new TextChatToken(stringBuilder.toString())
return new NameParsingState()
return new PersonaParsingState()
}
this
}
}
private class NameParsingState extends ParsingState {
NameParsingState() {
super(Constants.MAX_NICKNAME_LENGTH)
}
private class PersonaParsingState extends ParsingState {
@Override
ParsingState consume(char c) {
if (c == EQUALS)
return this
if (c == AT) {
consumed = true
currentName = stringBuilder.toString()
return new KeyParsingState()
}
this
}
}
private class KeyParsingState extends ParsingState {
KeyParsingState() {
super(32)
}
@Override
ParsingState consume(char c) {
if (!DataUtil.validBase32(c)) {
consumed = true
String payload = "${currentName}${stringBuilder.toString()}"
tokens << new TextChatToken(payload)
String payload = stringBuilder.toString()
payload = payload.substring(0, payload.length() - 1)
try {
Persona persona = new Persona(
new ByteArrayInputStream(Base64.decode(payload)))
PersonaOrProfile pop = function.apply(persona)
if (pop != null)
tokens << new POPChatToken(pop)
else
tokens << new TextChatToken(payload + "@")
} catch (Exception badPersona) {
tokens << new TextChatToken(payload + "@")
}
return new TextParsingState()
}
if (stringBuilder.length() == maxSize) {
if (!DataUtil.validBase64(c)) {
consumed = true
String readableName = "${currentName}${stringBuilder.toString()}"
PersonaOrProfile pop = function.apply(readableName)
if (pop != null)
tokens << new POPChatToken(pop)
else
tokens << new TextChatToken(readableName)
tokens << new TextChatToken(stringBuilder.toString())
return new TextParsingState()
}
return this

3
gui/src/main/groovy/com/muwire/gui/chat/ChatEntryPane.groovy
View File

@ -210,7 +210,8 @@ class ChatEntryPane extends JTextPane {
continue
}
POPLabel label = (POPLabel) component
sb.append(label.personaOrProfile.getPersona().getHumanReadableName())
sb.append(label.personaOrProfile.getPersona().toBase64())
sb.append(AT)
}
sb.toString()
}