ChronosXYZ/psyced
1
0
Fork 0
mirror of https://github.com/ChronosX88/psyced.git synced 2024-11-12 21:41:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'origin'

Browse Source
This commit is contained in:
psyc://psyced.org/~lynX 2009-04-02 08:57:11 +02:00
commit b04dfd66f2
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGESTODO
View File

@ -12,6 +12,9 @@ ________________________________________________________________________
- pointless to keep gentoo files in this git, if they can't be updated - pointless to keep gentoo files in this git, if they can't be updated
separately separately
+ teach net/smtp to trust localhost etc.
+ teach net/smtp to ask recipient object if spam rules are to be applied
________________________________________________________________________ ________________________________________________________________________
== currently being inspected =========================================== == currently being inspected ===========================================
¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
@ -1377,6 +1380,11 @@ ________________________________________________________________________
! When the /topic command makes funny errors, then your room has a custom ! When the /topic command makes funny errors, then your room has a custom
cmd() and doesn't pass vars over. It should use ON_COMMAND instead! cmd() and doesn't pass vars over. It should use ON_COMMAND instead!
________________________________________________________________________
* PSYC FUTURES see also http://about.psyc.eu/Category:Vapor
¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+ http://about.psyc.eu/Hashtags
+ http://about.psyc.eu/Follower
________________________________________________________________________ ________________________________________________________________________
* TOYS IN THE ATTIC * TOYS IN THE ATTIC
¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
@ -3886,3 +3894,4 @@ spyc/* psyc/*
+ should a _date type run on unixtime minus PSYC_EPOCH? + should a _date type run on unixtime minus PSYC_EPOCH?
install.sh install.sh
+ don't leave _host_IP uncommented + don't leave _host_IP uncommented
+ mkdir data/* log/*

6
world/default/en/jabber.textdb
View File

@ -1,6 +1,12 @@
<PSYC:TEXTDB> ## vim:syntax=mail <PSYC:TEXTDB> ## vim:syntax=mail
## Check utf-8: Praise Atatürk! ## Check utf-8: Praise Atatürk!
_notice_add_alias_temporary
|## shouldn't be sent to jabber clients
_failure_unavailable_alias
|## shouldn't be sent to jabber clients
_MISC_character_command _MISC_character_command
|## since several clients started catching / commands.. |## since several clients started catching / commands..
|+ |+

2
world/net/include/place.gen
View File

@ -146,7 +146,7 @@ inherit NET_PATH "place/mailcast";
# ifdef PUBLIC # ifdef PUBLIC
inherit NET_PATH "place/public"; inherit NET_PATH "place/public";
# else # else
// special case in the archetype options logic, see also the .pl // special case in the archetype options logic, see also psyconf
# ifndef PLACE_HISTORY # ifndef PLACE_HISTORY
# ifdef PLACE_HISTORY_EXPORT # ifdef PLACE_HISTORY_EXPORT
# define PLACE_HISTORY # define PLACE_HISTORY

4
world/net/person.c
View File

@ -2515,6 +2515,10 @@ reboot(reason, restart, pass) {
//unless (clonep(ME)) return; //unless (clonep(ME)) return;
if (blueprint(ME) == ME) return; if (blueprint(ME) == ME) return;
P2(("%O shutting down\n", ME)) P2(("%O shutting down\n", ME))
// temporary, please remove after 2009-04
if (!v("locations")) vSet("locations", ([]));
#if !defined(SLAVE) && !defined(_flag_disable_info_session) #if !defined(SLAVE) && !defined(_flag_disable_info_session)
if (ONLINE) { if (ONLINE) {
// same in net/psyc/circuit.c // same in net/psyc/circuit.c