Skip to content

Pretty messages #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ian-cameron wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Pretty messages #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24c30d3
Skip archived slack channels
ian-cameron Apr 6, 2018
56ea03c
Add warning about Slack private channels
tamhinsf Apr 5, 2018
64bd603
Fixing typo
tamhinsf Apr 5, 2018
abc6254
Display human friendly Date and Mentions in Slack Messages
ian-cameron Apr 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ChannelSurfCli/Utils/Channels.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ public class Channels
channelId = "";
}

if ((bool)obj.SelectToken("is_archived"))
{
Console.WriteLine("Skipping archived slack channel: {0}", obj["name"].ToString());
continue;
}

slackChannels.Add(new Models.Slack.Channels()
{
channelId = channelId,
Expand Down
13 changes: 10 additions & 3 deletions ChannelSurfCli/Utils/Messages.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.IO;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;

namespace ChannelSurfCli.Utils
{
Expand Down Expand Up @@ -54,10 +55,10 @@ public static void ScanMessagesByChannel(List<Models.Combined.ChannelsMapping> c

// deal with message basics: when, body, who

var messageTs = (string)obj.SelectToken("ts");
var messageTs = new DateTime(1970, 1, 1, 0, 0, 0).AddSeconds(Double.Parse((string)obj.SelectToken("ts")));
var messageText = (string)obj.SelectToken("text");
var messageId = channelsMapping.slackChannelId + "." + messageTs;
//messageText = RegexDetector.DetectSlackParens(messageText, slackUserList);
messageText = DetectSlackParens(messageText, slackUserList);
var messageSender = Utils.Messages.FindMessageSender(obj, slackUserList);

// create a list of attachments to upload
Expand Down Expand Up @@ -170,7 +171,7 @@ public static void ScanMessagesByChannel(List<Models.Combined.ChannelsMapping> c
{
id = messageId,
text = messageText,
ts = messageTs,
ts = messageTs.ToLocalTime().ToString(),
user = messageSender,
fileAttachment = fileAttachment,
attachments = attachmentsList,
Expand Down Expand Up @@ -358,6 +359,12 @@ public static string MessageToHtml(ViewModels.SimpleMessage simpleMessage, Model
return w;
}

static string DetectSlackParens(string messageText, List<ViewModels.SimpleUser> slackUserList)
{
return Regex.Replace(messageText, @"<@(\w+)>",
m => slackUserList.Where(w => w.userId == m.Groups[1].Value)
.DefaultIfEmpty(new ViewModels.SimpleUser() { name = m.Value }).First().name);
}

static string FindMessageSender(JObject obj, List<ViewModels.SimpleUser> slackUserList)
{
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ Either way, you'll need to decide if you want to:
* Re-create Slack channels

You can create a Slack Team export on a self-service basis as a Slack Team Owner or Admin at this page [https://my.slack.com/services/export](https://my.slack.com/services/export). Download the export file and tell Channel Surf its location. We'll scan it and re-create the Slack channel structure in Teams - and give you the option to do more.

WARNING: Slack channels can be public or private - a concept not currently supported in Microsoft Teams. This import tool will re-create all Slack channels in MS Teams, irrespective of whether they were public or private in Slack. Want that to change? Go ahead and [file an issue](https://github.com/tamhinsf/ChannelSurf/issues).

* Archive Slack message history (optional)

Expand Down