Skip to content

Commit

Permalink
socioboard
Browse files Browse the repository at this point in the history 
Github Commit
----------------------
Twitter feeds email text issue fixed
Socioqueue image error issue fixed
Youtube channel multi add account fixed
Same linkedin page adding account fixed
In dashboard instagram ligo issue fixed
Schedule updates emails getting issues fixed
Google analytics add account page while account adding check box issue
fixed
Compose message refresh textbox and attachment issue fixed
Sent messages image display issue fixed
Feeds comments special characters send issue fixed
Video file displaying in socioqueue issue fixed
Team invitation mail socioboard logo issue fixed
Instagram account adding error issue fixed
Linked in and company page image scheduling issue fixed
In email settings page team text issue fixed
Discovery and smart search text processing by enter issue fixed
In compose profiles linkedincompany page profile pic issue fixed
Resocio text issue fixed
Linked in Profile multi adding issue fixed
Socioboard referral text issue fixed
Sidebar suggetions ui issue fixed
social signin bug fixed
facebook page recent data issue fixed
  • Loading branch information
@socioboard
socioboard committed Sep 18, 2017
1 parent 0fee49c commit fb8ca90
Show file tree
Hide file tree
Showing 202 changed files with 3,124 additions and 1,304 deletions.
Binary file modified .vs/Socioboard/v14/.suo
View file
Binary file not shown.
56 changes: 43 additions & 13 deletions src/Api.Socioboard/Controllers/BoardMeController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,14 +261,21 @@ public IActionResult getTwitterFeeds(long boardId, int skip, int count)
var builder = Builders<MongoBoardTwtFeeds>.Sort;
var sort = builder.Descending(t => t.Publishedtime);
//var result = boardrepo.FindWithRange<MongoBoardTwtFeeds>(t => t.Twitterprofileid.Equals(board.twitterHashTag),sort,skip,count).ConfigureAwait(false); ;
var result = boardrepo.BoardFind<MongoBoardTwtFeeds>(t => t.Twitterprofileid.Equals(board.twitterHashTag)).ConfigureAwait(false);
// var result = boardrepo.BoardFind<MongoBoardTwtFeeds>(t => t.Twitterprofileid.Equals(board.twitterHashTag)).ConfigureAwait(false);
//var task = Task.Run(async () =>
//{
// return await result;
//});
//IList<MongoBoardTwtFeeds> objTwitterPagelist = task.Result;
//List<MongoBoardTwtFeeds> objBoardGplusPagefeeds = objTwitterPagelist.OrderByDescending(t => t.Publishedtime).Skip(Convert.ToInt32(skip)).Take(Convert.ToInt32(count)).ToList();
var result = boardrepo.FindWithRange<MongoBoardTwtFeeds>(t => t.Twitterprofileid.Equals(board.twitterHashTag), sort, skip, count);
var task = Task.Run(async () =>
{
return await result;
});
IList<MongoBoardTwtFeeds> objTwitterPagelist = task.Result;
List<MongoBoardTwtFeeds> objBoardGplusPagefeeds = objTwitterPagelist.OrderByDescending(t => t.Publishedtime).Skip(Convert.ToInt32(skip)).Take(Convert.ToInt32(count)).ToList();
return Ok(objBoardGplusPagefeeds);
//return Ok(objBoardGplusPagefeeds);
return Ok(objTwitterPagelist);

}
catch (Exception ex)
Expand All @@ -292,14 +299,21 @@ public IActionResult getInstagramFeeds(long boardId, int skip, int count)
var builder = Builders<MongoBoardInstagramFeeds>.Sort;
var sort = builder.Descending(t => t.Publishedtime);
//var result = boardrepo.FindWithRange<MongoBoardInstagramFeeds>(t => t.Instagramaccountid.Equals(board.instagramHashTag),sort,skip, count).ConfigureAwait(false);
var result = boardrepo.BoardFind<MongoBoardInstagramFeeds>(t => t.Instagramaccountid.Equals(board.instagramHashTag)).ConfigureAwait(false);
//var result = boardrepo.BoardFind<MongoBoardInstagramFeeds>(t => t.Instagramaccountid.Equals(board.instagramHashTag)).ConfigureAwait(false);
//var task = Task.Run(async () =>
//{
// return await result;
//});
//IList<MongoBoardInstagramFeeds> objTwitterPagelist = task.Result;
//List<MongoBoardInstagramFeeds> objBoardGplusPagefeeds = objTwitterPagelist.OrderByDescending(t => t.Publishedtime).Skip(Convert.ToInt32(skip)).Take(Convert.ToInt32(count)).ToList();
var result = boardrepo.FindWithRange<MongoBoardInstagramFeeds>(t => t.Instagramaccountid.Equals(board.instagramHashTag), sort, skip, count);
var task = Task.Run(async () =>
{
return await result;
});
IList<MongoBoardInstagramFeeds> objTwitterPagelist = task.Result;
List<MongoBoardInstagramFeeds> objBoardGplusPagefeeds = objTwitterPagelist.OrderByDescending(t => t.Publishedtime).Skip(Convert.ToInt32(skip)).Take(Convert.ToInt32(count)).ToList();
return Ok(objBoardGplusPagefeeds);
return Ok(objTwitterPagelist);
//return Ok(objBoardGplusPagefeeds);

}
catch (Exception ex)
Expand All @@ -312,7 +326,7 @@ public IActionResult getInstagramFeeds(long boardId, int skip, int count)


[HttpGet("getGplusfeeds")]
public IActionResult getGplusfeeds(long boardId, string skip, string count)
public IActionResult getGplusfeeds(long boardId, int skip, int count)
{
DatabaseRepository dbr = new DatabaseRepository(_logger, _env);
Domain.Socioboard.Models.MongoBoards board = BoardMeRepository.getBoard(boardId, _redisCache, _appSettings, _logger, dbr);
Expand All @@ -323,14 +337,21 @@ public IActionResult getGplusfeeds(long boardId, string skip, string count)
var builder = Builders<MongoBoardGplusFeeds>.Sort;
var sort = builder.Descending(t => t.Publishedtime);
//var result = boardrepo.FindWithRange<MongoBoardGplusFeeds>(t => t.Gplusboardaccprofileid.Equals(board.gplusHashTag),sort,Convert.ToInt32(skip),Convert.ToInt32(count)).ConfigureAwait(false);
var result = boardrepo.BoardFind<MongoBoardGplusFeeds>(t => t.Gplusboardaccprofileid.Equals(board.gplusHashTag)).ConfigureAwait(false);
//var result = boardrepo.BoardFind<MongoBoardGplusFeeds>(t => t.Gplusboardaccprofileid.Equals(board.gplusHashTag)).ConfigureAwait(false);
//var task = Task.Run(async () =>
//{
// return await result;
//});
//IList<MongoBoardGplusFeeds> objTwitterPagelist = task.Result;
//List<MongoBoardGplusFeeds> objBoardGplusPagefeeds = objTwitterPagelist.OrderByDescending(t => t.Publishedtime).Skip(Convert.ToInt32(skip)).Take(Convert.ToInt32(count)).ToList();
var result = boardrepo.FindWithRange<MongoBoardGplusFeeds>(t => t.Gplusboardaccprofileid.Equals(board.gplusHashTag), sort, skip, count);
var task = Task.Run(async () =>
{
return await result;
});
IList<MongoBoardGplusFeeds> objTwitterPagelist = task.Result;
List<MongoBoardGplusFeeds> objBoardGplusPagefeeds = objTwitterPagelist.OrderByDescending(t => t.Publishedtime).Skip(Convert.ToInt32(skip)).Take(Convert.ToInt32(count)).ToList();
return Ok(objBoardGplusPagefeeds);
return Ok(objTwitterPagelist);
//return Ok(objBoardGplusPagefeeds);
}
catch (Exception ex)
{
Expand All @@ -349,14 +370,23 @@ public IActionResult getfacebookFeeds(long boardId, int skip, int count)
MongoRepository boardrepo = new MongoRepository("MongoBoardFbTrendingFeeds", _appSettings);
try
{
var result = boardrepo.Find<MongoBoardFbTrendingFeeds>(t => t.facebookprofileid.Equals(board.facebookHashTag));
//var result = boardrepo.Find<MongoBoardFbTrendingFeeds>(t => t.facebookprofileid.Equals(board.facebookHashTag));
//var task = Task.Run(async () =>
//{
// return await result;
//});
//IList<MongoBoardFbTrendingFeeds> objTwitterPagelist = task.Result;
//List<MongoBoardFbTrendingFeeds> objBoardGplusPagefeeds = objTwitterPagelist.OrderByDescending(t => t.publishedtime).Skip(Convert.ToInt32(skip)).Take(Convert.ToInt32(count)).ToList();
//return Ok(objBoardGplusPagefeeds);
var builder = Builders<MongoBoardFbTrendingFeeds>.Sort;
var sort = builder.Descending(t => t.publishedtime);
var result = boardrepo.FindWithRange<MongoBoardFbTrendingFeeds>(t => t.facebookprofileid.Equals(board.facebookHashTag), sort, skip, count);
var task = Task.Run(async () =>
{
return await result;
});
IList<MongoBoardFbTrendingFeeds> objTwitterPagelist = task.Result;
List<MongoBoardFbTrendingFeeds> objBoardGplusPagefeeds = objTwitterPagelist.OrderByDescending(t => t.publishedtime).Skip(Convert.ToInt32(skip)).Take(Convert.ToInt32(count)).ToList();
return Ok(objBoardGplusPagefeeds);
return Ok(objTwitterPagelist);

}
catch (Exception ex)
Expand Down
32 changes: 28 additions & 4 deletions src/Api.Socioboard/Controllers/FacebookController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using Microsoft.AspNetCore.Hosting;
using Socioboard.Facebook.Data;
using Microsoft.AspNetCore.Cors;
using Domain.Socioboard.Models.Mongo;

// For more information on enabling Web API for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860

Expand Down Expand Up @@ -310,6 +311,29 @@ public IActionResult GetTopFeeds(string profileId, long userId, int skip, int co
// return Ok();
}

[HttpGet("GetLatestFeeds")]
public IActionResult GetLatestFeeds(string profileId, long userId, int skip, int count,string date)
{
DateTime lastfeeddate =Convert.ToDateTime(date);
DateTime currentdate = DateTime.UtcNow;
//Int32 unixTimestamp= Convert.ToInt32(date);
List<Domain.Socioboard.Models.Mongo.facebookfeed> lstfacebookfeed = new List<Domain.Socioboard.Models.Mongo.facebookfeed>();
MongoRepository mongorepo = new MongoRepository("MongoFacebookFeed", _appSettings);
var builder = Builders<Domain.Socioboard.Models.Mongo.MongoFacebookFeed>.Sort;
var sort = builder.Descending(t => t.FeedDate);
var result = mongorepo.FindWithRange<Domain.Socioboard.Models.Mongo.MongoFacebookFeed>(t => t.ProfileId.Equals(profileId), sort, skip, count);
var task = Task.Run(async () =>
{
return await result;
});
IList<Domain.Socioboard.Models.Mongo.MongoFacebookFeed> lstFbFeeds = task.Result;
List<Domain.Socioboard.Models.Mongo.LatestFacebookFeed> lstlatestfeed = new List<Domain.Socioboard.Models.Mongo.LatestFacebookFeed>();
lstlatestfeed = lstFbFeeds.Select(x => new LatestFacebookFeed() { EntryDate = Convert.ToDateTime(x.EntryDate), FeedDescription = x.FeedDescription, FeedDate=x.FeedDate, ProfileId=x.ProfileId, FromId=x.FromId, FromName=x.FromName, FromProfileUrl=x.FromProfileUrl, Type=x.Type, FbComment=x.FbComment, FbLike=x.FbLike, FeedId=x.FeedId, ReadStatus=x.ReadStatus, Picture=x.Picture, Positive=x.Positive, Negative=x.Negative, Commentcount=x.Commentcount, Likecount=x.Likecount, postType=x.postType, postingFrom=x.postingFrom, _facebookComment=x._facebookComment }).ToList();
lstlatestfeed=lstlatestfeed.FindAll(t => t.EntryDate > lastfeeddate && t.EntryDate <= currentdate).ToList();
return Ok(lstlatestfeed.ToList());

}

[HttpGet("GetTopFilterFeeds")]
public IActionResult GetTopFilterFeeds(string profileId, long userId, int skip, int count, string typeFilter)
{
Expand Down Expand Up @@ -404,7 +428,7 @@ public IActionResult AddFacebookPages(long userId, long groupId)
foreach (var item in accesstoken)
{
dynamic profile = Fbpages.getFbPageData(item);
// string subscribed_apps = Fbpages.subscribed_apps(item, Convert.ToString(profile["id"]));
string subscribed_apps = Fbpages.subscribed_apps(item, Convert.ToString(profile["id"]));
try
{
string x = Convert.ToString(profile);
Expand Down Expand Up @@ -494,7 +518,7 @@ public IActionResult ReconnFacebookPages(long userId, long groupId, string acces

int invalidaccessToken = 0;
dynamic profile = Fbpages.getFbPageData(accessToken);
string subscribed_apps = Fbpages.subscribed_apps(accessToken, Convert.ToString(profile["id"]));
try
{
string x = Convert.ToString(profile);
Expand Down Expand Up @@ -555,10 +579,10 @@ public IActionResult GetFacebookPostComment(string postId)
}

[HttpPost("PostFacebookComment")]
public IActionResult PostFacebookComment(string postId, string profileId, string message)
public IActionResult PostFacebookComment(string postId, string profileId, string message,string timezoneOffset)
{
DatabaseRepository dbr = new DatabaseRepository(_logger, _env);
string postcomment = Repositories.FacebookRepository.PostFacebookComment(dbr, message, profileId, postId, _redisCache, _appSettings, _logger);
string postcomment = Repositories.FacebookRepository.PostFacebookComment(dbr, message, profileId, postId, timezoneOffset, _redisCache, _appSettings, _logger);
if (postcomment.Contains("Invalid Access Token"))
{
return Ok("Invalid Access Token");
Expand Down
54 changes: 46 additions & 8 deletions src/Api.Socioboard/Controllers/GoogleController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
using System.IO;
using System.Threading;
using System.Text.RegularExpressions;
using System.Collections.Specialized;

// For more information on enabling Web API for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860

Expand Down Expand Up @@ -539,7 +540,7 @@ public IActionResult AddGoogleAccount(string code, long groupId, long userId)
_logger.LogInformation(ex.Message);
_logger.LogError(ex.StackTrace);
ret = "Access Token Not Found";
return Ok(ret);
return BadRequest(ret);
}
Domain.Socioboard.Models.Googleplusaccounts gplusAcc = Api.Socioboard.Repositories.GplusRepository.getGPlusAccount(Convert.ToString(userinfo["id"]), _redisCache, dbr);

Expand All @@ -549,7 +550,7 @@ public IActionResult AddGoogleAccount(string code, long groupId, long userId)
{
return BadRequest("GPlus account already added by you.");
}
return BadRequest("GPlus account added by other user.");
return BadRequest ("GPlus account added by other user.");
}
Groups ngrp = dbr.Find<Domain.Socioboard.Models.Groups>(t => t.adminId == userId && t.id == groupId).FirstOrDefault();
if (ngrp == null)
Expand Down Expand Up @@ -724,14 +725,39 @@ public IActionResult AddGaSites(long groupId, long userId)
string data = Request.Form["profileaccesstoken"];
DatabaseRepository dbr = new DatabaseRepository(_logger, _appEnv);
string[] profiledata = null;


int lstAddedAccounts = 0;
int lstNotAddedAccounts = 0;
ListDictionary listStatus = new ListDictionary();
string i = "0";


profiledata = data.Split(',');
foreach (var item in profiledata)
{
int j = Repositories.GplusRepository.AddGaSites(item, userId, groupId, _redisCache, _appSettings, dbr,_appEnv);
i = Repositories.GplusRepository.AddGaSites(item, userId, groupId, _redisCache, _appSettings, dbr,_appEnv);

if (i == "added by other")
{
lstNotAddedAccounts++;
}
else
{
lstAddedAccounts++;
}
}

listStatus.Add("added", lstAddedAccounts);
listStatus.Add("notadded", lstNotAddedAccounts);

if (lstAddedAccounts != 0 && lstNotAddedAccounts == 0)
{
return Ok("Google Analytics Company Page Added Successfully");
}
else
{
return Ok(listStatus);
}

return Ok("Added Successfully");
}

[HttpGet("GetGAProfiles")]
Expand Down Expand Up @@ -841,12 +867,24 @@ public IActionResult AddYoutubeChannels(long groupId, long userId)
string[] profiledata = null;

profiledata = data.Split(',');
string savedStatus = "";
foreach (var item in profiledata)
{
int j = Repositories.GplusRepository.AddYoutubeChannels(item, userId, groupId, _redisCache, _appSettings, dbr, _appEnv);
savedStatus = Repositories.GplusRepository.AddYoutubeChannels(item, userId, groupId, _redisCache, _appSettings, dbr, _appEnv);
}

return Ok("Added Successfully");
if (savedStatus == "Youtube already added by you")
{
return BadRequest("Youtube channel is already added by you");
}
else if (savedStatus == "Youtube added by any other")
{
return BadRequest("Youtube channel is already added by someone else");
}
else
{
return Ok("Added Successfully");
}
}

[HttpGet("GetYTChannelsSB")]
Expand Down
3 changes: 2 additions & 1 deletion src/Api.Socioboard/Controllers/GroupsController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ public GroupsController(ILogger<UserController> logger, IEmailSender emailSender
public IActionResult CreateGroup(Domain.Socioboard.Models.Groups group)
{
DatabaseRepository dbr = new DatabaseRepository(_logger, _appEnv);
if (dbr.Find<Domain.Socioboard.Models.Groups>(t => t.adminId == group.adminId && t.groupName.Equals(group.groupName)).Count > 0)
//if (dbr.Find<Domain.Socioboard.Models.Groups>(t => t.adminId == group.adminId && t.groupName.Equals(group.groupName)).Count > 0)
if (dbr.Find<Domain.Socioboard.Models.Groups>(t =>t.groupName.Equals(group.groupName)).Count > 0)
{
return Ok("Team Name Already Exist");
}
Expand Down
10 changes: 9 additions & 1 deletion src/Api.Socioboard/Controllers/InstagramController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,15 @@ public IActionResult AddInstagramAccount(long userId,long groupId,string code)
{
DatabaseRepository dbr = new DatabaseRepository(_logger, _appEnv);
string instagram = Repositories.InstagramRepository.AddInstagramAccount(_appSettings.InstagramClientKey,_appSettings.InstagramClientSec,_appSettings.InstagramCallBackURL,code,userId,groupId,dbr,_logger,_redisCache,_appSettings);
return Ok(instagram);
//return Ok(instagram);
if (instagram.Contains("This Account is added by somebody else")|| instagram.Contains("instagram account already added by you."))
{
return BadRequest(instagram);
}
else
{
return Ok (instagram);
}
}

[HttpGet("GetInstagramProfiles")]
Expand Down
Loading

0 comments on commit fb8ca90

Please sign in to comment.