copilot/frosty
1
0
Fork 0
Code Issues Pull requests Projects Releases 11 Packages Wiki Activity Actions

Implement handling of NOTICE command (#44)

Browse source
This commit is contained in:
tommyxchow 2021-11-23 00:47:21 -05:00
parent fa14f34119
commit 9875b6ed59
4 changed files with 43 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/api/irc_api.dart
View file

@ -177,6 +177,7 @@ enum Command {
privateMessage,
clearChat,
clearMessage,
notice,
userNotice,
roomState,
userState,

3
lib/models/irc.dart
View file

@ -70,6 +70,9 @@ class IRCMessage {
case 'CLEARMSG':
messageCommand = Command.clearMessage;
break;
case 'NOTICE':
messageCommand = Command.notice;
break;
case 'USERNOTICE':
messageCommand = Command.userNotice;
break;

2
lib/screens/channel/chat/chat.dart
View file

@ -35,7 +35,7 @@ class _ChatState extends State<Chat> {
itemCount: widget.chatStore.messages.length,
controller: widget.chatStore.scrollController,
itemBuilder: (context, index) {
return widget.chatStore.renderChatMessage(widget.chatStore.messages[index]);
return widget.chatStore.renderChatMessage(widget.chatStore.messages[index], context);
},
);
},

51
lib/screens/channel/chat/chat_store.dart
View file

@ -41,6 +41,9 @@ abstract class _ChatStoreBase with Store {
/// The logged-in user's appearance in chat.
String? _userState;
/// Requested message to be sent by the user. Will only be sent on receival of a USERNOTICE command.
IRCMessage? toSend;
/// If the chat should automatically scroll/jump to the latest message.
@readonly
var _autoScroll = true;
@ -104,33 +107,36 @@ abstract class _ChatStoreBase with Store {
switch (parsedIRCMessage.command) {
case Command.privateMessage:
messages.add(parsedIRCMessage);
_deleteAndScrollToEnd();
break;
case Command.clearChat:
IRC.clearChat(messages: messages, ircMessage: parsedIRCMessage);
_deleteAndScrollToEnd();
break;
case Command.clearMessage:
IRC.clearMessage(messages: messages, ircMessage: parsedIRCMessage);
_deleteAndScrollToEnd();
break;
case Command.notice:
case Command.userNotice:
messages.add(parsedIRCMessage);
_deleteAndScrollToEnd();
break;
case Command.roomState:
_roomState = _roomState.copyWith(parsedIRCMessage);
break;
continue;
case Command.userState:
_userState = message;
if (toSend != null) {
messages.add(toSend!);
toSend = null;
}
break;
case Command.globalUserState:
// Updates the current global user state data (it includes user-id),
// Don't really see a use for it when USERSTATE exists, so leaving it unimplemented for now.
break;
default:
continue;
case Command.none:
debugPrint('Unknown command: ${parsedIRCMessage.command}');
continue;
}
_deleteAndScrollToEnd();
} else if (message == 'PING :tmi.twitch.tv') {
_channel.sink.add('PONG :tmi.twitch.tv');
return;
@ -150,9 +156,11 @@ abstract class _ChatStoreBase with Store {
_channel.sink.add('PRIVMSG #$channelName :$message');
// Obtain the logged-in user's appearance in chat with USERSTATE and create the full message to render.
final userChatMessage = IRCMessage.fromString(_userState!);
userChatMessage.message = message;
messages.add(userChatMessage);
if (_userState != null) {
final userChatMessage = IRCMessage.fromString(_userState!);
userChatMessage.message = message;
toSend = userChatMessage;
}
// Clear the previous input in the TextField.
textController.clear();
@ -222,11 +230,12 @@ abstract class _ChatStoreBase with Store {
}
}
// TODO: Split render functions and use switch statment.
/// Returns a chat message widget for the given [IRCMessage].
Widget renderChatMessage(IRCMessage ircMessage) {
final span = IRC.generateSpan(ircMessage: ircMessage, assetToUrl: _assetToUrl);
Widget renderChatMessage(IRCMessage ircMessage, BuildContext context) {
if (ircMessage.command == Command.clearChat || ircMessage.command == Command.clearMessage) {
final span = IRC.generateSpan(ircMessage: ircMessage, assetToUrl: _assetToUrl);
// Render timeouts and bans
final banDuration = ircMessage.tags['ban-duration'];
return Padding(
@ -254,7 +263,21 @@ abstract class _ChatStoreBase with Store {
),
),
);
} else if (ircMessage.command == Command.notice) {
return Padding(
padding: const EdgeInsets.all(10.0),
child: Text.rich(
TextSpan(
text: ircMessage.message,
),
style: TextStyle(
color: Theme.of(context).textTheme.bodyText2?.color?.withOpacity(0.5),
),
),
);
} else if (ircMessage.command == Command.userNotice) {
final span = IRC.generateSpan(ircMessage: ircMessage, assetToUrl: _assetToUrl);
// Render sub alerts
return Container(
color: Colors.purple.withOpacity(0.3),
@ -274,6 +297,8 @@ abstract class _ChatStoreBase with Store {
),
);
} else {
final span = IRC.generateSpan(ircMessage: ircMessage, assetToUrl: _assetToUrl);
// Render normal chat message (PRIVMSG).
return Padding(
padding: const EdgeInsets.symmetric(vertical: 5.0, horizontal: 10.0),