aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sql/updates/4498_characters_channels.sql14
-rw-r--r--src/game/Channel.cpp126
-rw-r--r--src/game/Channel.h4
-rw-r--r--src/game/ChannelHandler.cpp3
-rw-r--r--src/game/ChannelMgr.h5
5 files changed, 146 insertions, 6 deletions
diff --git a/sql/updates/4498_characters_channels.sql b/sql/updates/4498_characters_channels.sql
new file mode 100644
index 00000000000..f4e8162b4e9
--- /dev/null
+++ b/sql/updates/4498_characters_channels.sql
@@ -0,0 +1,14 @@
+-- ----------------------------
+-- Table structure for channels
+-- ----------------------------
+DROP TABLE IF EXISTS `channels`;
+CREATE TABLE `channels` (
+ `m_name` text NOT NULL,
+ `m_team` int(10) unsigned NOT NULL,
+ `m_ownerGUID` int(11) unsigned NOT NULL default '0',
+ `m_announce` tinyint(1) unsigned NOT NULL default '0',
+ `m_moderate` tinyint(1) unsigned NOT NULL default '0',
+ `m_password` text,
+ `BannedList` longtext,
+ PRIMARY KEY (`m_name`(10),`m_team`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Access Requirements';
diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp
index 9bb3463dbdb..a247abe19ee 100644
--- a/src/game/Channel.cpp
+++ b/src/game/Channel.cpp
@@ -23,9 +23,10 @@
#include "SocialMgr.h"
#include "World.h"
-Channel::Channel(const std::string& name, uint32 channel_id)
-: m_announce(true), m_moderate(false), m_name(name), m_flags(0), m_channelId(channel_id), m_ownerGUID(0)
+Channel::Channel(const std::string& name, uint32 channel_id, uint32 Team)
+ : m_name(name), m_announce(true), m_moderate(false), m_channelId(channel_id), m_ownerGUID(0), m_password(""), m_flags(0)
{
+ m_Team = Team;
// set special flags if built-in channel
ChatChannelsEntry const* ch = GetChannelEntryFor(channel_id);
if(ch) // it's built-in channel
@@ -45,10 +46,54 @@ Channel::Channel(const std::string& name, uint32 channel_id)
m_flags |= CHANNEL_FLAG_LFG;
else // for all other channels
m_flags |= CHANNEL_FLAG_NOT_LFG;
+ m_IsSaved = false;
}
else // it's custom channel
{
m_flags |= CHANNEL_FLAG_CUSTOM;
+ //load not built in channel if saved
+ QueryResult *result = CharacterDatabase.PQuery("SELECT m_name, m_team, m_ownerGUID, m_announce, m_moderate, m_password, BannedList FROM channels WHERE m_name = '%s' AND m_team = '%u'", name.c_str(), m_Team);
+ if (result)//load
+ {
+ Field *fields = result->Fetch();
+ const char* db_name = fields[0].GetString();
+ uint32 db_team = fields[1].GetUInt32();
+ uint64 db_owner = fields[2].GetUInt64();
+ bool db_announce = fields[3].GetBool();
+ bool db_moderate = fields[4].GetBool();
+ const char* db_password = fields[5].GetString();
+ const char* db_BannedList = fields[6].GetString();
+
+ m_ownerGUID = db_owner;
+ m_announce = db_announce;
+ m_moderate = db_moderate;
+ m_password = db_password;
+ m_IsSaved = true;
+
+ if(db_BannedList)
+ {
+ Tokens tokens = StrSplit(db_BannedList, " ");
+ Tokens::iterator iter;
+ for (iter = tokens.begin();iter != tokens.end(); ++iter)
+ {
+ uint64 banned_guid = atol((*iter).c_str());
+ if(banned_guid)
+ {
+ sLog.outDebug("Channel(%s) loaded banned guid: %u",name.c_str(), banned_guid);
+ banned.insert(banned_guid);
+ }
+ }
+ }
+ }else{//save
+ std::ostringstream ss;
+ ss << "INSERT INTO channels (m_name,m_team,m_ownerGUID,m_announce,m_moderate,m_password) VALUES ('"
+ << name.c_str() << "','" << m_Team << "','0','1','0','')";
+ if(CharacterDatabase.PExecuteLog( ss.str( ).c_str( ) ))
+ {
+ sLog.outDebug("New Channel(%s) saved", name.c_str());
+ m_IsSaved = true;
+ }
+ }
}
}
@@ -120,6 +165,10 @@ void Channel::Join(uint64 p, const char *pass)
if(!IsConstant() && !m_ownerGUID)
{
SetOwner(p, (players.size() > 1 ? true : false));
+ players[p].SetModerator(true);
+ }else if(!IsConstant() && m_ownerGUID && plr && m_ownerGUID == plr->GetGUID())
+ {
+ SetOwner(p, (players.size() > 1 ? true : false));
players[p].SetModerator(true);
}
}
@@ -161,7 +210,7 @@ void Channel::Leave(uint64 p, bool send)
LeaveNotify(p);
- if(changeowner)
+ if(changeowner && !m_IsSaved)
{
uint64 newowner = !players.empty() ? players.begin()->second.player : 0;
SetOwner(newowner);
@@ -213,6 +262,23 @@ void Channel::KickOrBan(uint64 good, const char *badname, bool ban)
{
banned.insert(bad->GetGUID());
MakePlayerBanned(&data, bad->GetGUID(), good);
+ //save banlist
+ if(m_IsSaved)
+ {
+ std::ostringstream banlist;
+ BannedList::iterator iter;
+ for (iter = banned.begin();iter != banned.end(); ++iter)
+ {
+ banlist << (*iter) << " ";
+ }
+ std::ostringstream ss;
+ ss << "UPDATE channels SET BannedList = '" << banlist.str().c_str() << "' WHERE m_name = '"<<m_name.c_str()<<"' AND m_team = '"<<m_Team<<"'";
+ if(CharacterDatabase.PExecuteLog( ss.str( ).c_str( ) ))
+ {
+ sLog.outDebug("Channel(%s) BannedList saved", m_name.c_str());
+ }
+ }
+
}
else
MakePlayerKicked(&data, bad->GetGUID(), good);
@@ -265,6 +331,22 @@ void Channel::UnBan(uint64 good, const char *badname)
WorldPacket data;
MakePlayerUnbanned(&data, bad->GetGUID(), good);
SendToAll(&data);
+ //save banlist
+ if(m_IsSaved)
+ {
+ std::ostringstream banlist;
+ BannedList::iterator iter;
+ for (iter = banned.begin();iter != banned.end(); ++iter)
+ {
+ banlist << (*iter) << " ";
+ }
+ std::ostringstream ss;
+ ss << "UPDATE channels SET BannedList = '" << banlist.str().c_str() << "' WHERE m_name = '"<<m_name.c_str()<<"' AND m_team = '"<<m_Team<<"'";
+ if(CharacterDatabase.PExecuteLog( ss.str( ).c_str( ) ))
+ {
+ sLog.outDebug("Channel(%s) BannedList saved", m_name.c_str());
+ }
+ }
}
}
}
@@ -295,6 +377,15 @@ void Channel::Password(uint64 p, const char *pass)
WorldPacket data;
MakePasswordChanged(&data, p);
SendToAll(&data);
+ if(m_IsSaved)
+ {
+ std::ostringstream ss;
+ ss << "UPDATE channels SET m_password = '" << pass << "' WHERE m_name = '"<<m_name.c_str()<<"' AND m_team = '"<<m_Team<<"'";
+ if(CharacterDatabase.PExecuteLog( ss.str( ).c_str( ) ))
+ {
+ sLog.outDebug("Channel(%s) password saved", m_name.c_str());
+ }
+ }
}
}
@@ -500,6 +591,16 @@ void Channel::Announce(uint64 p)
else
MakeAnnouncementsOff(&data, p);
SendToAll(&data);
+ if(m_IsSaved)
+ {
+ std::ostringstream ss;
+ ss << "UPDATE channels SET m_announce = '" << m_announce << "' WHERE m_name = '"<<m_name.c_str()<<"' AND m_team = '"<<m_Team<<"'";
+ if(CharacterDatabase.PExecuteLog( ss.str( ).c_str( ) ))
+ {
+ sLog.outDebug("Channel(%s) announce saved", m_name.c_str());
+ }
+ }
+
}
}
@@ -532,6 +633,15 @@ void Channel::Moderate(uint64 p)
else
MakeModerationOff(&data, p);
SendToAll(&data);
+ if(m_IsSaved)
+ {
+ std::ostringstream ss;
+ ss << "UPDATE channels SET m_moderate = '" << m_moderate << "' WHERE m_name = '"<<m_name.c_str()<<"' AND m_team = '"<<m_Team<<"'";
+ if(CharacterDatabase.PExecuteLog( ss.str( ).c_str( ) ))
+ {
+ sLog.outDebug("Channel(%s) moderate saved", m_name.c_str());
+ }
+ }
}
}
@@ -659,6 +769,16 @@ void Channel::SetOwner(uint64 guid, bool exclaim)
MakeOwnerChanged(&data, m_ownerGUID);
SendToAll(&data);
}
+ if(m_IsSaved)
+ {
+ std::ostringstream ss;
+ ss << "UPDATE channels SET m_ownerGUID = '" << guid << "' WHERE m_name = '"<<m_name.c_str()<<"' AND m_team = '"<<m_Team<<"'";
+ if(CharacterDatabase.PExecuteLog( ss.str( ).c_str( ) ))
+ {
+ sLog.outDebug("Channel(%s) owner saved", m_name.c_str());
+ }
+ }
+
}
}
diff --git a/src/game/Channel.h b/src/game/Channel.h
index c2dd5ecd3ac..69a1e2f66f6 100644
--- a/src/game/Channel.h
+++ b/src/game/Channel.h
@@ -158,6 +158,7 @@ class Channel
uint8 m_flags;
uint32 m_channelId;
uint64 m_ownerGUID;
+ bool m_IsSaved;
private:
// initial packet data (notify type and channel name)
@@ -243,7 +244,8 @@ class Channel
}
public:
- Channel(const std::string& name, uint32 channel_id);
+ uint32 m_Team;
+ Channel(const std::string& name, uint32 channel_id, uint32 Team = 0);
std::string GetName() const { return m_name; }
uint32 GetChannelId() const { return m_channelId; }
bool IsConstant() const { return m_channelId != 0; }
diff --git a/src/game/ChannelHandler.cpp b/src/game/ChannelHandler.cpp
index 45cdf8c20b2..9706e5657e7 100644
--- a/src/game/ChannelHandler.cpp
+++ b/src/game/ChannelHandler.cpp
@@ -48,8 +48,11 @@ void WorldSession::HandleJoinChannel(WorldPacket& recvPacket)
recvPacket >> pass;
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+ {
+ cMgr->team = _player->GetTeam();
if(Channel *chn = cMgr->GetJoinChannel(channelname, channel_id))
chn->Join(_player->GetGUID(), pass.c_str());
+ }
}
void WorldSession::HandleLeaveChannel(WorldPacket& recvPacket)
diff --git a/src/game/ChannelMgr.h b/src/game/ChannelMgr.h
index aeecfbfa541..956309e9873 100644
--- a/src/game/ChannelMgr.h
+++ b/src/game/ChannelMgr.h
@@ -31,8 +31,9 @@
class ChannelMgr
{
public:
+ uint32 team;
typedef std::map<std::string,Channel *> ChannelMap;
- ChannelMgr() {}
+ ChannelMgr() {team = 0;}
~ChannelMgr()
{
for(ChannelMap::const_iterator itr = channels.begin();itr!=channels.end(); ++itr)
@@ -43,7 +44,7 @@ class ChannelMgr
{
if (channels.find(name) == channels.end())
{
- Channel *nchan = new Channel(name,channel_id);
+ Channel *nchan = new Channel(name,channel_id, team);
channels[name] = nchan;
}
return channels[name];