zotan/tgcli
1
0
Fork 0
Code Issues 10 Pull requests Releases Wiki Activity

emoji improvements

Browse source
This commit is contained in:
Laura Hausmann 2019-12-10 13:21:49 +01:00
parent 0089fd7075
commit 1f2e39f1a0
Signed by: zotan
GPG key ID: 5EC1D38FFC321311
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.idea/.idea.tgcli/.idea/contentModel.xml
View file

@ -1122,7 +1122,6 @@
</e> </e>
</e> </e>
</e> </e>
<e p="tdlib.log" t="Include" />
<e p="telegram.csproj" t="IncludeRecursive" /> <e p="telegram.csproj" t="IncludeRecursive" />
<e p="tgcli.cs" t="Include" /> <e p="tgcli.cs" t="Include" />
<e p="Util.cs" t="Include" /> <e p="Util.cs" t="Include" />

4
.idea/.idea.tgcli/.idea/workspace.xml
View file

@ -2,7 +2,9 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="36e5cfaf-0aa9-4137-8110-a5678a9c5443" name="Default Changelist" comment=""> <list default="true" id="36e5cfaf-0aa9-4137-8110-a5678a9c5443" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.idea.tgcli/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.tgcli/.idea/contentModel.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.tgcli/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.tgcli/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/.idea.tgcli/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.tgcli/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/telegram/Util.cs" beforeDir="false" afterPath="$PROJECT_DIR$/telegram/Util.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/telegram/tgcli.cs" beforeDir="false" afterPath="$PROJECT_DIR$/telegram/tgcli.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/telegram/tgcli.cs" beforeDir="false" afterPath="$PROJECT_DIR$/telegram/tgcli.cs" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -120,7 +122,7 @@
<workItem from="1575536428992" duration="12000" /> <workItem from="1575536428992" duration="12000" />
<workItem from="1575536474314" duration="39215000" /> <workItem from="1575536474314" duration="39215000" />
<workItem from="1575724030612" duration="6335000" /> <workItem from="1575724030612" duration="6335000" />
<workItem from="1575806456895" duration="27705000" /> <workItem from="1575806456895" duration="30336000" />
</task> </task>
<servers /> <servers />
</component> </component>

6
telegram/Util.cs
View file

@ -142,7 +142,11 @@ namespace telegram
{ {
if (string.IsNullOrWhiteSpace(message)) if (string.IsNullOrWhiteSpace(message))
return; return;
message = message.Replace("⏎", "\n"); message = message.Replace("⏎", "\n")
.Replace(":xd:", "😂")
.Replace(":shrug:", "🤷")
.Replace(":shrugf:", "🤷‍♀️")
.Replace(":shrugm:", "🤷‍♂️");
client.ExecuteAsync(new SendMessage client.ExecuteAsync(new SendMessage
{ {
ChatId = chatId, ChatId = chatId,

10
telegram/tgcli.cs
View file

@ -13,7 +13,8 @@ namespace telegram
* TODO: * TODO:
* reply to x messages ago * reply to x messages ago
* cap length & truncate extremely long chat names! * cap length & truncate extremely long chat names!
* make emojis not break terminal -> :shrug: and stuff * replace emoji on send & un-replace on edit, two-way dictionary!!
* replace more emojis on send (is there a lib for that)
* make typing newlines actually good (inputline as list?) * make typing newlines actually good (inputline as list?)
* fix history not fully displaying on channel open (query returning less results than expected?) * fix history not fully displaying on channel open (query returning less results than expected?)
* waaay more error messages instead of just doing nothing * waaay more error messages instead of just doing nothing
@ -320,7 +321,6 @@ namespace telegram
if (!specialKeys.Contains(key.Key)) if (!specialKeys.Contains(key.Key))
{ {
currentInputLine += key.KeyChar; currentInputLine += key.KeyChar;
//TODO currentInputLine = currentInputLine.Replace(":xd:", "😂");
ScreenUpdate(); ScreenUpdate();
} }
@ -415,8 +415,8 @@ namespace telegram
var prefix = $"{Ansi.Bold}{Ansi.Green}[{time}] {Ansi.Cyan}{chat.Title} " + var prefix = $"{Ansi.Bold}{Ansi.Green}[{time}] {Ansi.Cyan}{chat.Title} " +
$"{(isPrivate || isChannel ? "" : $"{Ansi.Yellow}{username} ")}"; $"{(isPrivate || isChannel ? "" : $"{Ansi.Yellow}{username} ")}";
var indent = new string(' ', getActualStringWidth(prefix)); var indent = new string(' ', getActualStringWidth(prefix));
//var furtherIndent = new string(' ', getActualStringWidth("»»» ")); var furtherIndent = new string(' ', getActualStringWidth("»»» "));
var furtherIndent = $"{(msg.IsOutgoing ? $"{Ansi.Blue}»»»" : $"{Ansi.Magenta}«««")} "; var arrows = $"{(msg.IsOutgoing ? $"{Ansi.Blue}»»»" : $"{Ansi.Magenta}«««")} ";
if (isReply && cascade) if (isReply && cascade)
{ {
@ -445,7 +445,7 @@ namespace telegram
finalOutput += "\n" + indent + lines.First(); finalOutput += "\n" + indent + lines.First();
lines.RemoveAt(0); lines.RemoveAt(0);
} }
lines.ForEach(l => finalOutput += "\n" + indent + furtherIndent + l); lines.ForEach(l => finalOutput += "\n" + indent + arrows + l);
return finalOutput; return finalOutput;
} }